1) Whitespace/CS

2) Portability: don't expect any values and have them in the [U]EXPECTF,
if they will be available only with certain MySQL Server versions.

diff --git a/ext/mysql/tests/mysql_query.phpt b/ext/mysql/tests/mysql_query.phpt
index 44b5c53b9c1d3a66383e0e45509116a1cb808a5f..185aa1ea8e1917c6c4f574a5802a7f6c4198c44f 100644 (file)
--- a/ext/mysql/tests/mysql_query.phpt
+++ b/ext/mysql/tests/mysql_query.phpt
@@ -2,100 +2,99 @@
 mysql_query()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-    include "connect.inc";
-    
-    $tmp    = NULL;   
-    $link   = NULL;    
-    
-    if (!is_null($tmp = @mysql_query()))
-        printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-        
-    if (false !== ($tmp = @mysql_query($link)))
-        printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
-        
-    require('table.inc');
-    
-    if (NULL !== ($tmp = @mysql_query("SELECT 1 AS a", $link, "foo")))
-        printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-    
-    if (false !== ($tmp = mysql_query('THIS IS NOT SQL', $link)))
-        printf("[004] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
-        
-    if (false !== ($tmp = mysql_query('SELECT "this is sql but with backslash g"\g', $link)))
-        printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);        
-        
-    if ((0 === mysql_errno($link)) || ('' == mysql_error($link)))
-        printf("[006] mysql_errno()/mysql_error should return some error\n");
-        
-    if (!$res = mysql_query('SELECT "this is sql but with semicolon" AS valid ; ', $link))
-        printf("[007] [%d] %s\n", mysql_errno($link), mysql_error($link));
-    
-    var_dump(mysql_fetch_assoc($res));    
-    mysql_free_result($res);
-        
-    if (false !== ($res = mysql_query('SELECT "this is sql but with semicolon" AS valid ; SHOW VARIABLES', $link)))
-        printf("[008] [%d] %s\n", mysql_errno($link), mysql_error($link));
-        
-    if (mysql_query('DROP PROCEDURE IF EXISTS p', $link)) {
-        // let's try to play with stored procedures        
-        if (mysql_query('CREATE PROCEDURE p(OUT ver_param VARCHAR(25)) BEGIN SELECT VERSION() INTO ver_param; END;', $link)) {
-            $res = mysql_query('CALL p(@version)', $link);    
-            $res = mysql_query('SELECT @version AS p_version', $link);
-            var_dump(mysql_fetch_assoc($res));            
-            mysql_free_result($res);
-        } else {
-            printf("[009] [%d] %s\n", mysql_errno($link), mysql_error($link));
-        }
-        
-        mysql_query('DROP FUNCTION IF EXISTS f', $link);
-        if (mysql_query('CREATE FUNCTION f( ver_param VARCHAR(25)) RETURNS VARCHAR(25) DETERMINISTIC RETURN ver_param;', $link)) {
-            $res = mysql_query('SELECT f(VERSION()) AS f_version', $link);
-            var_dump(mysql_fetch_assoc($res));
-            mysql_free_result($res);
-        } else {
-            printf("[010] [%d] %s\n", mysql_errno($link), mysql_error($link));
-        }
-    }
-    
-    mysql_close($link);
-    
-    if (false !== ($tmp = mysql_query("SELECT id FROM test", $link)))
-        printf("[011] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
-    
-    print "done!";
+include_once("connect.inc");
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_query()))
+       printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = @mysql_query($link)))
+       printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+
+if (NULL !== ($tmp = @mysql_query("SELECT 1 AS a", $link, "foo")))
+       printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = mysql_query('THIS IS NOT SQL', $link)))
+       printf("[004] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = mysql_query('SELECT "this is sql but with backslash g"\g', $link)))
+       printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if ((0 === mysql_errno($link)) || ('' == mysql_error($link)))
+       printf("[006] mysql_errno()/mysql_error should return some error\n");
+
+if (!$res = mysql_query('SELECT "this is sql but with semicolon" AS valid ; ', $link))
+       printf("[007] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+var_dump(mysql_fetch_assoc($res));
+mysql_free_result($res);
+
+if (false !== ($res = mysql_query('SELECT "this is sql but with semicolon" AS valid ; SHOW VARIABLES', $link)))
+       printf("[008] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (mysql_query('DROP PROCEDURE IF EXISTS p', $link)) {
+       // let's try to play with stored procedures
+       if (mysql_query('CREATE PROCEDURE p(OUT ver_param VARCHAR(25)) BEGIN SELECT VERSION() INTO ver_param; END;', $link)) {
+               $res = mysql_query('CALL p(@version)', $link);
+               $res = mysql_query('SELECT @version AS p_version', $link);
+               $tmp = mysql_fetch_assoc($res);
+               if (!isset($tmp['p_version']) || ('' == $tmp['p_version'])) {
+                       printf("[009] Result seems wrong, dumping\n");
+                       var_dump($tmp);
+               }
+               if (ini_get('unicode.semantics') && !is_unicode($tmp['p_version'])) {
+                       printf("[010] Expecting unicode string, dumping\n");
+                       var_dump($tmp);
+               }
+               mysql_free_result($res);
+       } else {
+               printf("[011] [%d] %s\n", mysql_errno($link), mysql_error($link));
+       }
+
+       mysql_query('DROP FUNCTION IF EXISTS f', $link);
+       if (mysql_query('CREATE FUNCTION f( ver_param VARCHAR(25)) RETURNS VARCHAR(25) DETERMINISTIC RETURN ver_param;', $link)) {
+               $res = mysql_query('SELECT f(VERSION()) AS f_version', $link);
+               $tmp = mysql_fetch_assoc($res);
+               if (!isset($tmp['f_version']) || ('' == $tmp['f_version'])) {
+                       printf("[012] Result seems wrong, dumping\n");
+                       var_dump($tmp);
+               }
+               if (ini_get('unicode.semantics') && !is_unicode($tmp['f_version'])) {
+                       printf("[013] Expecting unicode string, dumping\n");
+                       var_dump($tmp);
+               }
+               mysql_free_result($res);
+       } else {
+               printf("[014] [%d] %s\n", mysql_errno($link), mysql_error($link));
+       }
+}
+
+mysql_close($link);
+
+if (false !== ($tmp = mysql_query("SELECT id FROM test", $link)))
+       printf("[011] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+print "done!";
 ?>
 --EXPECTF--
 array(1) {
   ["valid"]=>
   string(30) "this is sql but with semicolon"
 }
-array(1) {
-  ["p_version"]=>
-  string(%d) "%s"
-}
-array(1) {
-  ["f_version"]=>
-  string(%d) "%s"
-}
 
 Warning: mysql_query(): %d is not a valid MySQL-Link resource in %s on line %d
-done! 
+done!
 --UEXPECTF--
 array(1) {
   [u"valid"]=>
   unicode(30) "this is sql but with semicolon"
 }
-array(1) {
-  [u"p_version"]=>
-  unicode(%d) "%s"
-}
-array(1) {
-  [u"f_version"]=>
-  unicode(%d) "%s"
-}
 
 Warning: mysql_query(): %d is not a valid MySQL-Link resource in %s on line %d
-done! 
+done!
\ No newline at end of file