PHP mysqlnd svn commit: r1261 - trunk/tests/ext/pdo_mysql

[uwendel]

Author: uwendel
Date: 2008-02-06 17:38:24 +0100 (Wed, 06 Feb 2008)
New Revision: 1261

Modified:
   trunk/tests/ext/pdo_mysql/pdo_mysql_attr_oracle_nulls.phpt
Log:
Adding test for NULL


Modified: trunk/tests/ext/pdo_mysql/pdo_mysql_attr_oracle_nulls.phpt
===================================================================
--- trunk/tests/ext/pdo_mysql/pdo_mysql_attr_oracle_nulls.phpt	2008-02-06 15:33:15 UTC
(rev 1260)
+++ trunk/tests/ext/pdo_mysql/pdo_mysql_attr_oracle_nulls.phpt	2008-02-06 16:38:24 UTC
(rev 1261)
@@ -25,16 +25,16 @@
 		printf("[003] Maybe PDO could indicate that this is not a proper way of setting
ATTR_ORACLE_NULLS...\n");
 
 	$db->setAttribute(PDO::ATTR_ORACLE_NULLS, 1);
-	$stmt = $db->query('SELECT "" AS a, " " AS b, TRIM(" ") as c, " d" AS d, "' . chr(0)
. ' e" AS e');
+	$stmt = $db->query('SELECT NULL AS z, "" AS a, " " AS b, TRIM(" ") as c, " d" AS d,
"' . chr(0) . ' e" AS e');
 	var_dump($stmt->fetchAll(PDO::FETCH_ASSOC));
 
 	$db->setAttribute(PDO::ATTR_ORACLE_NULLS, 0);
-	$stmt = $db->query('SELECT "" AS a, " " AS b, TRIM(" ") as c, " d" AS d, "' . chr(0)
. ' e" AS e');
+	$stmt = $db->query('SELECT NULL AS z, "" AS a, " " AS b, TRIM(" ") as c, " d" AS d,
"' . chr(0) . ' e" AS e');
 	var_dump($stmt->fetchAll(PDO::FETCH_ASSOC));
 
 	$db->setAttribute(PDO::ATTR_ORACLE_NULLS, 1);
 	if ((false !== $db->exec('DROP PROCEDURE IF EXISTS p')) &&
-		(false !== $db->exec('CREATE PROCEDURE p() BEGIN SELECT "" AS a, " " AS b, TRIM(" ")
as c, " d" AS d, " e" AS e; END;'))) {
+		(false !== $db->exec('CREATE PROCEDURE p() BEGIN SELECT NULL as z, "" AS a, " " AS
b, TRIM(" ") as c, " d" AS d, " e" AS e; END;'))) {
 		// requires MySQL 5+
 		$stmt = $db->prepare('CALL p()');
 		$stmt->execute();
@@ -45,7 +45,9 @@
 --EXPECTF--
 array(1) {
   [0]=>
-  array(5) {
+  array(6) {
+    ["z"]=>
+    NULL
     ["a"]=>
     NULL
     ["b"]=>
@@ -55,12 +57,14 @@
     ["d"]=>
     string(2) " d"
     ["e"]=>
-    string(3) " e"
+    string(3) "  e"
   }
 }
 array(1) {
   [0]=>
-  array(5) {
+  array(6) {
+    ["z"]=>
+    NULL
     ["a"]=>
     string(0) ""
     ["b"]=>
@@ -70,12 +74,14 @@
     ["d"]=>
     string(2) " d"
     ["e"]=>
-    string(3) " e"
+    string(3) "  e"
   }
 }
 array(1) {
   [0]=>
-  array(5) {
+  array(6) {
+    ["z"]=>
+    NULL
     ["a"]=>
     NULL
     ["b"]=>