uw Thu Jul 12 20:31:18 2007 UTC
Modified files:
/php-src/ext/mysqli/tests 002.phpt
Log:
More typical changes:
1) Try to have portable SQL, don't create your own schema unless the test
wants to test exactly this
2) Don't rely on default SQL sort orders
3) Use proper UEXPECTF. There have been a lot of tiny unicode issues when
ext/mysqli has returned a binary string in unicode mode although a
unicode string could be expected and vice versa
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/002.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mysqli/tests/002.phpt
diff -u php-src/ext/mysqli/tests/002.phpt:1.6
php-src/ext/mysqli/tests/002.phpt:1.7
--- php-src/ext/mysqli/tests/002.phpt:1.6 Tue Sep 26 13:06:13 2006
+++ php-src/ext/mysqli/tests/002.phpt Thu Jul 12 20:31:18 2007
@@ -7,23 +7,28 @@
include "connect.inc";
/*** test mysqli_connect 127.0.0.1 ***/
- $link = mysqli_connect($host, $user, $passwd);
- $link->query("CREATE SCHEMA test");
+ if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+ printf("[001] [%d] %s\n", mysqli_connect_errno(),
mysqli_connect_error());
- mysqli_select_db($link, "test");
- $rc = mysqli_query($link,"DROP TABLE IF EXISTS test_fetch_null");
+ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch_null"))
+ printf("[002] Cannot drop table, [%d] %s\n",
mysqli_errno($link), mysqli_error($link));
- $rc = mysqli_query($link,"CREATE TABLE test_fetch_null(col1 tinyint,
col2 smallint,
- col3 int, col4 bigint,
- col5 float, col6 double,
- col7 date, col8 time,
- col9 varbinary(10),
- col10 varchar(50),
- col11 char(20))");
+ $rc = mysqli_query($link,"CREATE TABLE test_fetch_null(col1 tinyint,
col2 smallint,
+
col3 int, col4 bigint,
+
col5 float, col6 double,
+
col7 date, col8 time,
+
col9 varbinary(10),
+
col10 varchar(50),
+
col11 char(20)) ENGINE=" . $engine);
+
+ if (!$rc)
+ printf("[003] Cannot create table, [%d] %s\n",
mysqli_errno($link), mysqli_error($link));
- $rc = mysqli_query($link,"INSERT INTO test_fetch_null(col1,col10,
col11) VALUES(1,'foo1', 1000),(2,'foo2', 88),(3,'foo3', 389789)");
+ $rc = mysqli_query($link, "INSERT INTO test_fetch_null(col1,col10,
col11) VALUES(1,'foo1', 1000),(2,'foo2', 88),(3,'foo3', 389789)");
+ if (!$rc)
+ printf("[004] Cannot insert records, [%d] %s\n",
mysqli_errno($link), mysqli_error($link));
- $stmt = mysqli_prepare($link, "SELECT col1, col2, col3, col4, col5,
col6, col7, col8, col9, col10, col11 from test_fetch_null");
+ $stmt = mysqli_prepare($link, "SELECT col1, col2, col3, col4, col5,
col6, col7, col8, col9, col10, col11 from test_fetch_null ORDER BY col1");
mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8, $c9,
$c10, $c11);
mysqli_execute($stmt);
@@ -35,6 +40,7 @@
mysqli_stmt_close($stmt);
mysqli_close($link);
+ print "done!";
?>
--EXPECTF--
array(11) {
@@ -57,7 +63,34 @@
[8]=>
NULL
[9]=>
- %s(4) "foo1"
+ string(4) "foo1"
+ [10]=>
+ string(4) "1000"
+}
+done!
+--UEXPECTF--
+array(11) {
+ [0]=>
+ int(1)
+ [1]=>
+ NULL
+ [2]=>
+ NULL
+ [3]=>
+ NULL
+ [4]=>
+ NULL
+ [5]=>
+ NULL
+ [6]=>
+ NULL
+ [7]=>
+ NULL
+ [8]=>
+ NULL
+ [9]=>
+ unicode(4) "foo1"
[10]=>
- %s(4) "1000"
+ unicode(4) "1000"
}
+done!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
