summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Baratz <adambaratz@php.net>2016-09-13 17:01:51 -0400
committerAdam Baratz <adambaratz@php.net>2016-09-13 17:01:51 -0400
commitbcee34c649c7a26bebf282ca94e08ef06b882017 (patch)
tree8ca11467ecad1c9e7c881ec381852099f1c16a55
parent0de333bd6279249096be4f040838e658b009da47 (diff)
downloadphp-git-bcee34c649c7a26bebf282ca94e08ef06b882017.tar.gz
Add special case for earlier versions of TDS
-rw-r--r--ext/pdo/tests/pdo_018.phpt17
1 files changed, 14 insertions, 3 deletions
diff --git a/ext/pdo/tests/pdo_018.phpt b/ext/pdo/tests/pdo_018.phpt
index d931a2c1c0..80e3453287 100644
--- a/ext/pdo/tests/pdo_018.phpt
+++ b/ext/pdo/tests/pdo_018.phpt
@@ -129,9 +129,20 @@ unset($stmt);
echo "===DATA===\n";
$res = $db->query('SELECT test.val FROM test')->fetchAll(PDO::FETCH_COLUMN);
-// For Oracle map NULL to empty string so the test doesn't diff
-if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'oci' && $res[0] === null) {
- $res[0] = "";
+switch ($db->getAttribute(PDO::ATTR_DRIVER_NAME)) {
+ case 'dblib':
+ // map whitespace (from early TDS versions) to empty string so the test doesn't diff
+ if ($res[0] === ' ') {
+ $res[0] = '';
+ }
+ break;
+
+ case 'oci':
+ // map NULL to empty string so the test doesn't diff
+ if ($res[0] === null) {
+ $res[0] = '';
+ }
+ break;
}
var_dump($res);