uw Thu Jul 12 20:38:26 2007 UTC
Modified files:
/php-src/ext/mysqli/tests 005.phpt 006.phpt 007.phpt 008.phpt
009.phpt
Log:
The usual tweaking:
- take connection parameter from connect.inc
- use proper UEXPECTF
- have 'print "done!"' or similar at the end to detect crashes
- whitespace changes where needed
- take care of portability: PHP 5 vs. PHP 5, MySQL 4.1 - 6.0
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/005.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysqli/tests/005.phpt
diff -u php-src/ext/mysqli/tests/005.phpt:1.5
php-src/ext/mysqli/tests/005.phpt:1.6
--- php-src/ext/mysqli/tests/005.phpt:1.5 Tue Sep 26 13:06:13 2006
+++ php-src/ext/mysqli/tests/005.phpt Thu Jul 12 20:38:26 2007
@@ -7,12 +7,13 @@
include "connect.inc";
/*** test mysqli_connect 127.0.0.1 ***/
- $link = mysqli_connect($host, $user, $passwd);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
- mysqli_select_db($link, "test");
-
- mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
- mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 char(10), c2
text)");
+ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
+ printf("[001] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
+
+ if (!mysqli_query($link, "CREATE TABLE test_bind_fetch(c1 char(10), c2
text) ENGINE=" . $engine))
+ printf("[002] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
$a = str_repeat("A1", 32000);
@@ -30,11 +31,21 @@
mysqli_stmt_close($stmt);
mysqli_close($link);
+ print "done!";
?>
--EXPECTF--
array(2) {
[0]=>
- %s(10) "1234567890"
+ string(10) "1234567890"
+ [1]=>
+ string(13) "32K String ok"
+}
+done!
+--UEXPECTF--
+array(2) {
+ [0]=>
+ unicode(10) "1234567890"
[1]=>
- %s(13) "32K String ok"
+ unicode(13) "32K String ok"
}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/006.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysqli/tests/006.phpt
diff -u php-src/ext/mysqli/tests/006.phpt:1.5
php-src/ext/mysqli/tests/006.phpt:1.6
--- php-src/ext/mysqli/tests/006.phpt:1.5 Wed Jan 4 23:04:06 2006
+++ php-src/ext/mysqli/tests/006.phpt Thu Jul 12 20:38:26 2007
@@ -5,23 +5,28 @@
--FILE--
<?php
include "connect.inc";
-
+
/*** test mysqli_connect 127.0.0.1 ***/
- $link = mysqli_connect($host, $user, $passwd);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+
+ if (!mysqli_query($link, "SET sql_mode=''"))
+ printf("[001] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
- mysqli_select_db($link, "test");
- mysqli_query($link, "SET sql_mode=''");
+ if (!mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"))
+ printf("[002] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
- mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
- mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 int unsigned,
- c2 int unsigned,
- c3 int,
- c4 int,
- c5 int,
- c6 int unsigned,
- c7 int)");
+ $rc = mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 int unsigned,
+
c2 int unsigned,
+
c3 int,
+
c4 int,
+
c5 int,
+
c6 int unsigned,
+
c7 int) ENGINE=" . $engine);
+ if (!$rc)
+ printf("[003] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
- mysqli_query($link, "INSERT INTO test_bind_fetch VALUES
(-23,35999,NULL,-500,-9999999,-0,0)");
+ if (!mysqli_query($link, "INSERT INTO test_bind_fetch VALUES
(-23,35999,NULL,-500,-9999999,-0,0)"))
+ printf("[004] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
$stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch");
mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
@@ -34,6 +39,7 @@
mysqli_stmt_close($stmt);
mysqli_close($link);
+ print "done!";
?>
--EXPECT--
array(7) {
@@ -52,3 +58,4 @@
[6]=>
int(0)
}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/007.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysqli/tests/007.phpt
diff -u php-src/ext/mysqli/tests/007.phpt:1.5
php-src/ext/mysqli/tests/007.phpt:1.6
--- php-src/ext/mysqli/tests/007.phpt:1.5 Wed Jan 4 23:04:06 2006
+++ php-src/ext/mysqli/tests/007.phpt Thu Jul 12 20:38:26 2007
@@ -5,23 +5,28 @@
--FILE--
<?php
include "connect.inc";
-
+
/*** test mysqli_connect 127.0.0.1 ***/
- $link = mysqli_connect($host, $user, $passwd);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+
+ if (!mysqli_query($link, "SET sql_mode=''"))
+ printf("[001] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
- mysqli_select_db($link, "test");
- mysqli_query($link, "SET sql_mode=''");
+ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
+ printf("[002] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
- mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
- mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 smallint unsigned,
- c2 smallint unsigned,
- c3 smallint,
- c4 smallint,
- c5 smallint,
- c6 smallint unsigned,
- c7 smallint)");
+ $rc = mysqli_query($link, "CREATE TABLE test_bind_fetch(c1 smallint
unsigned,
+
c2 smallint unsigned,
+
c3 smallint,
+
c4 smallint,
+
c5 smallint,
+
c6 smallint unsigned,
+
c7 smallint) ENGINE=" . $engine);
+ if (!$rc)
+ printf("[003] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
- mysqli_query($link, "INSERT INTO test_bind_fetch VALUES
(-23,35999,NULL,-500,-9999999,+30,0)");
+ if (!mysqli_query($link, "INSERT INTO test_bind_fetch VALUES
(-23,35999,NULL,-500,-9999999,+30,0)"))
+ printf("[004] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
$stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch");
mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
@@ -34,6 +39,7 @@
mysqli_stmt_close($stmt);
mysqli_close($link);
+ print "done!";
?>
--EXPECT--
array(7) {
@@ -52,3 +58,4 @@
[6]=>
int(0)
}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/008.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysqli/tests/008.phpt
diff -u php-src/ext/mysqli/tests/008.phpt:1.5
php-src/ext/mysqli/tests/008.phpt:1.6
--- php-src/ext/mysqli/tests/008.phpt:1.5 Wed Jan 4 23:04:06 2006
+++ php-src/ext/mysqli/tests/008.phpt Thu Jul 12 20:38:26 2007
@@ -5,23 +5,28 @@
--FILE--
<?php
include "connect.inc";
-
+
/*** test mysqli_connect 127.0.0.1 ***/
- $link = mysqli_connect($host, $user, $passwd);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+
+ if (!mysqli_query($link, "SET sql_mode=''"))
+ printf("[001] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
- mysqli_select_db($link, "test");
- mysqli_query($link, "SET sql_mode=''");
+ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
+ printf("[002] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
- mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
- mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 tinyint,
- c2 tinyint unsigned,
- c3 tinyint not NULL,
- c4 tinyint,
- c5 tinyint,
- c6 tinyint unsigned,
- c7 tinyint)");
+ $rc = mysqli_query($link, "CREATE TABLE test_bind_fetch(c1 tinyint,
+
c2 tinyint unsigned,
+
c3 tinyint not NULL,
+
c4 tinyint,
+
c5 tinyint,
+
c6 tinyint unsigned,
+
c7 tinyint) ENGINE=" . $engine);
+ if (!$rc)
+ printf("[003] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
- mysqli_query($link, "INSERT INTO test_bind_fetch VALUES
(-23,300,0,-100,-127,+30,0)");
+ if (!mysqli_query($link, "INSERT INTO test_bind_fetch VALUES
(-23,300,0,-100,-127,+30,0)"))
+ printf("[004] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
$stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch");
mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
@@ -34,6 +39,7 @@
mysqli_stmt_close($stmt);
mysqli_close($link);
+ print "done!";
?>
--EXPECT--
array(7) {
@@ -52,3 +58,4 @@
[6]=>
int(0)
}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/009.phpt?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/mysqli/tests/009.phpt
diff -u php-src/ext/mysqli/tests/009.phpt:1.8
php-src/ext/mysqli/tests/009.phpt:1.9
--- php-src/ext/mysqli/tests/009.phpt:1.8 Tue Sep 26 13:06:13 2006
+++ php-src/ext/mysqli/tests/009.phpt Thu Jul 12 20:38:26 2007
@@ -11,39 +11,56 @@
--FILE--
<?php
include "connect.inc";
-
+
/*** test mysqli_connect 127.0.0.1 ***/
- $link = mysqli_connect($host, $user, $passwd);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
- mysqli_select_db($link, "test");
- mysqli_query($link, "SET sql_mode=''");
+ if (!mysqli_query($link, "SET sql_mode=''"))
+ printf("[001] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
- mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
- mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 bigint default 5,
- c2 bigint,
- c3 bigint not NULL,
- c4 bigint unsigned,
- c5 bigint unsigned,
- c6 bigint unsigned,
- c7 bigint unsigned)");
+ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
+ printf("[002] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
- mysqli_query($link, "INSERT INTO test_bind_fetch (c2,c3,c4,c5,c6,c7)
VALUES (-23,4.0,33333333333333,0,-333333333333,99.9)");
+ $rc = mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 bigint
default 5,
+
c2 bigint,
+
c3 bigint not NULL,
+
c4 bigint unsigned,
+
c5 bigint unsigned,
+
c6 bigint unsigned,
+
c7 bigint unsigned) ENGINE=" . $engine);
+ if (!$rc)
+ printf("[003] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
+
+ $rc = mysqli_query($link, "INSERT INTO test_bind_fetch
(c2,c3,c4,c5,c6,c7) ".
+ "VALUES
(-23,4.0,33333333333333,0,-333333333333,99.9)");
+ if (!$rc)
+ printf("[004] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
$stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch");
mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
mysqli_execute($stmt);
$rc = mysqli_fetch($stmt);
+ if (mysqli_get_server_version($link) < 50000) {
+ // 4.1 is faulty and will return big number for $c6
+ if ($c6 == "18446743740376218283") {
+ $c6 = 0;
+ }
+ }
$test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7);
var_dump($test);
mysqli_stmt_close($stmt);
- mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch_uint");
- mysqli_query($link,"CREATE TABLE test_bind_fetch_uint(c1 integer
unsigned, c2 integer unsigned)");
+ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch_uint"))
+ printf("[005] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
+ $rc = mysqli_query($link, "CREATE TABLE test_bind_fetch_uint(c1 integer
unsigned, c2 integer unsigned) ENGINE=" . $engine);
+ if (!$rc)
+ printf("[006] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
- mysqli_query($link, "INSERT INTO test_bind_fetch_uint (c1,c2) VALUES
(20123456, 3123456789)");
+ if (!mysqli_query($link, "INSERT INTO test_bind_fetch_uint (c1,c2)
VALUES (20123456, 3123456789)"))
+ printf("[007] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
$stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch_uint");
mysqli_bind_result($stmt, $c1, $c2);
@@ -53,9 +70,8 @@
echo $c1, "\n", $c2, "\n";
mysqli_stmt_close($stmt);
-
-
mysqli_close($link);
+ print "done!";
?>
--EXPECTF--
@@ -67,7 +83,27 @@
[2]=>
int(4)
[3]=>
- %s(14) "33333333333333"
+ string(14) "33333333333333"
+ [4]=>
+ int(0)
+ [5]=>
+ int(0)
+ [6]=>
+ int(100)
+}
+20123456
+3123456789
+done!
+--UEXPECTF--
+array(7) {
+ [0]=>
+ int(5)
+ [1]=>
+ int(-23)
+ [2]=>
+ int(4)
+ [3]=>
+ unicode(14) "33333333333333"
[4]=>
int(0)
[5]=>
@@ -77,3 +113,4 @@
}
20123456
3123456789
+done!
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
