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

[ahristov]

Author: ahristov
Date: 2007-07-17 17:40:58 +0200 (Tue, 17 Jul 2007)
New Revision: 775

Modified:
   trunk/tests/ext/mysqli/mysqli_character_set.phpt
Log:
Skip UCS2, the server is buggy


Modified: trunk/tests/ext/mysqli/mysqli_character_set.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_character_set.phpt	2007-07-17 12:40:56 UTC (rev 774)
+++ trunk/tests/ext/mysqli/mysqli_character_set.phpt	2007-07-17 15:40:58 UTC (rev 775)
@@ -35,12 +35,16 @@
 	mysqli_free_result($res);
 
 	foreach ($charsets as $k => $charset) {
+		/* The server currently 17.07.2007 can't handle data sent in ucs2 */
+		if ($charset['Charset'] == 'ucs2') {
+			continue;
+		}
 
 		if (!mysqli_query($link, "DROP TABLE IF EXISTS test"))
 			printf("[006 + %d] [%d] %s\n", $k, mysqli_errno($link), mysqli_error($link));
 
 		$sql = sprintf("CREATE TABLE test(id INT, label CHAR(1)) CHARACTER SET '%s' ",
$charset['Charset']);
-		if (mysqli_query($link, $sql)) {
+		if (!mysqli_query($link, $sql)) {
 			printf("[007 + %d] %s [%d] %s\n", $k, $sql, mysqli_errno($link), mysqli_error($link));
 			continue;
 		}
@@ -50,10 +54,15 @@
 			continue;
 		}
 
-		for ($i = 1; $i <= 3; $i++)
-			if (!mysqli_query($link, sprintf("INSERT INTO test(id, label) VALUES (%d, '%s')",
-					$i, mysqli_real_escape_string($link, chr(ord("a") + $i)))))
+		for ($i = 1; $i <= 3; $i++) {
+			if (!mysqli_query($link, sprintf("INSERT INTO test (id, label) VALUES (%d, '%s')",
+								$i, mysqli_real_escape_string($link, chr(ord("a") + $i)))))
+			{
+				var_dump($charset['Charset']);
 				printf("[009 + %d] [%d] %s\n", $k, mysqli_errno($link), mysqli_error($link));
+				continue;
+			}
+		}
 
 		if (!$res = mysqli_query($link, "SELECT id, label FROM test"))
 			printf("[010 + %d] [%d] %s\n", $k, mysqli_errno($link), mysqli_error($link));
@@ -82,4 +91,4 @@
 	print "done!";
 ?>
 --EXPECTF--
-done!
\ No newline at end of file
+done!