PHP mysqlnd svn commit: r209 - trunk/ext/mysqli/tests

[uwendel]

Author: uwendel
Date: 2007-03-20 16:04:02 +0100 (Tue, 20 Mar 2007)
New Revision: 209

Modified:
   trunk/ext/mysqli/tests/mysqli_query.phpt
   trunk/ext/mysqli/tests/mysqli_real_query.phpt
Log:
Portability: make the test pass on pre 5.0-something servers that won't generate the
expected output


Modified: trunk/ext/mysqli/tests/mysqli_query.phpt
===================================================================
--- trunk/ext/mysqli/tests/mysqli_query.phpt	2007-03-20 15:02:13 UTC (rev 208)
+++ trunk/ext/mysqli/tests/mysqli_query.phpt	2007-03-20 15:04:02 UTC (rev 209)
@@ -45,7 +45,13 @@
         if (mysqli_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(25)) BEGIN
SELECT VERSION() INTO ver_param; END;')) {
             $res = mysqli_query($link, 'CALL p(@version)');    
             $res = mysqli_query($link, 'SELECT @version AS p_version');
-            var_dump(mysqli_fetch_assoc($res));            
+            
+            $tmp = mysqli_fetch_assoc($res);
+            if (!is_array($tmp) || empty($tmp) || !isset($tmp['p_version']) || ('' ==
$tmp['p_version'])) {
+              printf("[008a] Expecting array [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
+              var_dump($tmp);
+            }
+            
             mysqli_free_result($res);
         } else {
             printf("[009] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@@ -54,7 +60,13 @@
         mysqli_query($link, 'DROP FUNCTION IF EXISTS f');
         if (mysqli_query($link, 'CREATE FUNCTION f( ver_param VARCHAR(25)) RETURNS
VARCHAR(25) DETERMINISTIC RETURN ver_param;')) {
             $res = mysqli_query($link, 'SELECT f(VERSION()) AS f_version');            
-            var_dump(mysqli_fetch_assoc($res));
+            
+            $tmp = mysqli_fetch_assoc($res);
+            if (!is_array($tmp) || empty($tmp) || !isset($tmp['f_version']) || ('' ==
$tmp['f_version'])) {
+              printf("[009a] Expecting array [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
+              var_dump($tmp);
+            }
+            
             mysqli_free_result($res);
         } else {
             printf("[010] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@@ -73,14 +85,6 @@
   ["valid"]=>
   string(30) "this is sql but with semicolon"
 }
-array(1) {
-  ["p_version"]=>
-  string(%d) "%s"
-}
-array(1) {
-  ["f_version"]=>
-  string(%d) "%s"
-}
 
 Warning: mysqli_query(): Couldn't fetch mysqli in %s on line %d
 done! 
\ No newline at end of file

Modified: trunk/ext/mysqli/tests/mysqli_real_query.phpt
===================================================================
--- trunk/ext/mysqli/tests/mysqli_real_query.phpt	2007-03-20 15:02:13 UTC (rev 208)
+++ trunk/ext/mysqli/tests/mysqli_real_query.phpt	2007-03-20 15:04:02 UTC (rev 209)
@@ -49,7 +49,13 @@
             mysqli_real_query($link, 'CALL p(@version)');
             mysqli_real_query($link, 'SELECT @version AS p_version');
             $res = mysqli_store_result($link);
-            var_dump(mysqli_fetch_assoc($res));
+            
+            $tmp = mysqli_fetch_assoc($res);
+            if (!is_array($tmp) || empty($tmp) || !isset($tmp['p_version']) || ('' ==
$tmp['p_version'])) {
+              printf("[008a] Expecting array [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
+              var_dump($tmp);
+            }
+            
             mysqli_free_result($res);
         } else {
             printf("[009] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@@ -60,7 +66,13 @@
 ver_param;')) {
             mysqli_real_query($link, 'SELECT f(VERSION()) AS f_version');
             $res = mysqli_store_result($link);
-            var_dump(mysqli_fetch_assoc($res));
+            
+            $tmp = mysqli_fetch_assoc($res);
+            if (!is_array($tmp) || empty($tmp) || !isset($tmp['f_version']) || ('' ==
$tmp['f_version'])) {
+              printf("[009a] Expecting array [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
+              var_dump($tmp);
+            }
+            
             mysqli_free_result($res);
         } else {
             printf("[010] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@@ -79,14 +91,6 @@
   ["valid"]=>
   string(30) "this is sql but with semicolon"
 }
-array(1) {
-  ["p_version"]=>
-  string(%d) "%s"
-}
-array(1) {
-  ["f_version"]=>
-  string(%d) "%s"
-}
 
 Warning: mysqli_real_query(): Couldn't fetch mysqli in %s on line %d
 done!