dprevot/php-pdo-sqlsrv
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed the flaws of decimal tests and added more debugging (#879)

Browse source
This commit is contained in:
Jenny Tam 2018-11-16 15:03:53 -08:00 committed by GitHub
parent d51f6db9c1
commit 78911f4697
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
test/functional/pdo_sqlsrv/pdostatement_format_decimals.phpt
View file

@ -188,21 +188,26 @@ function compareNumbers($actual, $input, $column, $fieldScale, $formatDecimal =
$matched = false;
if ($actual === $input) {
$matched = true;
trace("$actual, $input\n");
trace("Matched: $actual, $input\n");
} else {
// When $formatDecimal is negative, that means no formatting done
// Otherwise, if $formatDecimal > $fieldScale, will show $fieldScale decimal digits
if ($formatDecimal >= 0) {
$numDecimals = ($formatDecimal > $fieldScale) ? $fieldScale : $formatDecimal;
$expected = number_format($input, $numDecimals);
} else {
$numDecimals = $fieldScale;
$expected = number_format($input, $fieldScale);
if (abs($input) < 1) {
// Since no formatting, the leading zero should not be there
trace("Drop leading zero of $input--");
$expected = str_replace('0.', '.', $expected);
}
}
$expected = number_format($input, $numDecimals);
trace("$actual, $expected\n");
trace("With number_format: $actual, $expected\n");
if ($actual === $expected) {
$matched = true;
} else {
echo "For $column: expected $expected but the value is $actual\n";
echo "For $column ($formatDecimal): expected $expected ($input) but the value is $actual\n";
}
}
return $matched;
@ -265,7 +270,7 @@ function getOutputParam($conn, $storedProcName, $inputValue, $prec, $scale, $ino
$paramType = PDO::PARAM_STR | PDO::PARAM_INPUT_OUTPUT;
// For inout parameters the input type should match the output one
$outString = '0.0';
$outString = '0.0';
} else {
$paramType = PDO::PARAM_STR;
}

13
test/functional/sqlsrv/sqlsrv_statement_format_decimals.phpt
View file

@ -30,19 +30,26 @@ function compareNumbers($actual, $input, $column, $fieldScale, $formatDecimal =
$matched = false;
if ($actual === $input) {
$matched = true;
trace("Matched: $actual, $input\n");
} else {
// When $formatDecimal is negative, that means no formatting done
// Otherwise, if $formatDecimal > $fieldScale, will show $fieldScale decimal digits
if ($formatDecimal >= 0) {
$numDecimals = ($formatDecimal > $fieldScale) ? $fieldScale : $formatDecimal;
$expected = number_format($input, $numDecimals);
} else {
$numDecimals = $fieldScale;
$expected = number_format($input, $fieldScale);
if (abs($input) < 1) {
// Since no formatting, the leading zero should not be there
trace("Drop leading zero of $input--");
$expected = str_replace('0.', '.', $expected);
}
}
$expected = number_format($input, $numDecimals);
trace("With number_format: $actual, $expected\n");
if ($actual === $expected) {
$matched = true;
} else {
echo "For $column: expected $expected but the value is $actual\n";
echo "For $column ($formatDecimal): expected $expected ($input) but the value is $actual\n";
}
}
return $matched;