From bcee34c649c7a26bebf282ca94e08ef06b882017 Mon Sep 17 00:00:00 2001 From: Adam Baratz Date: Tue, 13 Sep 2016 17:01:51 -0400 Subject: [PATCH] Add special case for earlier versions of TDS --- ext/pdo/tests/pdo_018.phpt | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/ext/pdo/tests/pdo_018.phpt b/ext/pdo/tests/pdo_018.phpt index d931a2c1c07..80e34532872 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);