uw Tue, 08 Jun 2010 13:05:49 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=300275
Log:
More SQL strict mode updates
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_types.phpt
U
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
U
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
U
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
U
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
U
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
U
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt
U
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_types.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
U
php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
U
php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_types.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_types.phpt 2010-06-08 13:00:54 UTC (rev 300274)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_types.phpt 2010-06-08 13:05:49 UTC (rev 300275)
@@ -17,16 +17,20 @@
return false;
}
- $sql = sprintf("CREATE TABLE test(id %s)", $sql_type);
- if (!mysqli_query($link, $sql)) {
- printf("[002] %s, [%d] %s\n", $sql_type,
+ $create = sprintf("CREATE TABLE test(id %s)", $sql_type);
+ if (!mysqli_query($link, $create)) {
+ printf("[002] '%s' - '%s', [%d] %s\n", $sql_type, $create,
mysqli_errno($link), mysqli_error($link));
return false;
}
- $sql = sprintf("INSERT INTO test(id) VALUES ('%s')", $php_value);
+ if (is_string($php_value))
+ $sql = sprintf("INSERT INTO test(id) VALUES ('%s')", $php_value);
+ else
+ $sql = sprintf("INSERT INTO test(id) VALUES (%s)", $php_value);
+
if (!mysqli_query($link, $sql)) {
- printf("[003] %s, [%d] %s\n", $sql_type,
+ printf("[003] '%s' - '%s' - '%s', [%d] %s\n", $sql_type, $create, $sql,
mysqli_errno($link), mysqli_error($link));
return false;
}
@@ -85,7 +89,7 @@
MYSQLI_TYPE_VAR_STRING => array("VARCHAR(32768)", 'varchar'),
MYSQLI_TYPE_STRING => 'MYSQLI_TYPE_STRING - TODO add testing',
MYSQLI_TYPE_STRING => array('CHAR(1)', 'a'),
- MYSQLI_TYPE_STRING => array("SET('I', 'smash', 'the')", 'Will be converted to string although it is a SET...'),
+ MYSQLI_TYPE_STRING => array("SET('I', 'smash', 'the')", 'smash'),
MYSQLI_TYPE_NULL => 'MYSQLI_TYPE_NULL - TODO add testing',
MYSQLI_TYPE_NEWDATE => 'MYSQLI_TYPE_NEWDATE - TODO add testing',
MYSQLI_TYPE_INTERVAL => 'MYSQLI_TYPE_INTERVAL - TODO add testing',
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt 2010-06-08 13:00:54 UTC (rev 300274)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt 2010-06-08 13:05:49 UTC (rev 300275)
@@ -20,35 +20,62 @@
?>
--FILE--
<?php
-
require_once("connect.inc");
- require_once('table.inc');
+ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+{
+ printf("[001] Cannot connect to the server using host=%s, user=%s,
+passwd=***, dbname=%s, port=%s, socket=%s - [%d] %s\n", $host, $user, $db,
+$port, $socket, mysqli_connect_errno(), mysqli_connect_error());
+ }
+
+ if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
+ printf("Failed to drop old test table: [%d] %s\n", mysqli_errno($link),
+mysqli_error($link));
+ }
+
+ if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY
+KEY(id)) ENGINE=' . $engine . " DEFAULT CHARSET=big5")) {
+ printf("Failed to create test table: [%d] %s\n", mysqli_errno($link),
+mysqli_error($link));
+ }
+
var_dump(mysqli_set_charset($link, "big5"));
- if ('���H�U���e\\\\���H�U���e' !== ($tmp = mysqli_real_escape_string($link, '���H�U���e\\���H�U���e')))
+ if ('���H�U���e\\\\���H�U���e' !== ($tmp = mysqli_real_escape_string($link,
+'���H�U���e\\���H�U���e')))
printf("[004] Expecting \\\\, got %s\n", $tmp);
- if ('���H�U���e\"���H�U���e' !== ($tmp = mysqli_real_escape_string($link, '���H�U���e"���H�U���e')))
+ if ('���H�U���e\"���H�U���e' !== ($tmp = mysqli_real_escape_string($link,
+'���H�U���e"���H�U���e')))
printf("[005] Expecting \", got %s\n", $tmp);
- if ("���H�U���e\'���H�U���e" !== ($tmp = mysqli_real_escape_string($link, "���H�U���e'���H�U���e")))
+ if ("���H�U���e\'���H�U���e" !== ($tmp = mysqli_real_escape_string($link,
+"���H�U���e'���H�U���e")))
printf("[006] Expecting ', got %s\n", $tmp);
- if ("���H�U���e\\n���H�U���e" !== ($tmp = mysqli_real_escape_string($link, "���H�U���e\n���H�U���e")))
+ if ("���H�U���e\\n���H�U���e" !== ($tmp = mysqli_real_escape_string($link,
+"���H�U���e\n���H�U���e")))
printf("[007] Expecting \\n, got %s\n", $tmp);
- if ("���H�U���e\\r���H�U���e" !== ($tmp = mysqli_real_escape_string($link, "���H�U���e\r���H�U���e")))
+ if ("���H�U���e\\r���H�U���e" !== ($tmp = mysqli_real_escape_string($link,
+"���H�U���e\r���H�U���e")))
printf("[008] Expecting \\r, got %s\n", $tmp);
- if ("���H�U���e\\0���H�U���e" !== ($tmp = mysqli_real_escape_string($link, "���H�U���e" . chr(0) . "���H�U���e")))
+ if ("���H�U���e\\0���H�U���e" !== ($tmp = mysqli_real_escape_string($link, "���H�U���e"
+. chr(0) . "���H�U���e")))
printf("[009] Expecting %s, got %s\n", "���H�U���e\\0���H�U���e", $tmp);
- var_dump(mysqli_query($link, "INSERT INTO test(id, label) VALUES (100, '��')"));
+ var_dump(mysqli_query($link, "INSERT INTO test(id, label) VALUES (100,
+'��')"));
mysqli_close($link);
print "done!";
?>
+--CLEAN--
+<?php
+ require_once("clean_table.inc");
+?>
--EXPECTF--
bool(true)
bool(true)
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt 2010-06-08 13:00:54 UTC (rev 300274)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt 2010-06-08 13:05:49 UTC (rev 300275)
@@ -20,9 +20,26 @@
?>
--FILE--
<?php
- require_once("connect.inc");
- require_once('table.inc');
+require_once("connect.inc");
+ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+{
+ printf("[001] Cannot connect to the server using host=%s, user=%s,
+passwd=***, dbname=%s, port=%s, socket=%s - [%d] %s\n", $host, $user, $db,
+$port, $socket, mysqli_connect_errno(), mysqli_connect_error());
+ }
+
+ if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
+ printf("Failed to drop old test table: [%d] %s\n", mysqli_errno($link),
+mysqli_error($link));
+ }
+
+ if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY
+KEY(id)) ENGINE=' . $engine . " DEFAULT CHARSET=eucjpms")) {
+ printf("Failed to create test table: [%d] %s\n", mysqli_errno($link),
+mysqli_error($link));
+ }
+
var_dump(mysqli_set_charset($link, "eucjpms"));
if ('�����Ȥ߹�碌�Ǥ�\\\\�����Ȥ߹�碌�Ǥ�' !== ($tmp = mysqli_real_escape_string($link, '�����Ȥ߹�碌�Ǥ�\\�����Ȥ߹�碌�Ǥ�')))
@@ -48,6 +65,10 @@
mysqli_close($link);
print "done!";
?>
+--CLEAN--
+<?php
+ require_once("clean_table.inc");
+?>
--EXPECTF--
bool(true)
bool(true)
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt 2010-06-08 13:00:54 UTC (rev 300274)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt 2010-06-08 13:05:49 UTC (rev 300275)
@@ -21,8 +21,24 @@
--FILE--
<?php
require_once("connect.inc");
- require_once('table.inc');
+ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+{
+ printf("[001] Cannot connect to the server using host=%s, user=%s,
+passwd=***, dbname=%s, port=%s, socket=%s - [%d] %s\n", $host, $user, $db,
+$port, $socket, mysqli_connect_errno(), mysqli_connect_error());
+ }
+ if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
+ printf("Failed to drop old test table: [%d] %s\n", mysqli_errno($link),
+mysqli_error($link));
+ }
+
+ if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY
+KEY(id)) ENGINE=' . $engine . " DEFAULT CHARSET=euckr")) {
+ printf("Failed to create test table: [%d] %s\n", mysqli_errno($link),
+mysqli_error($link));
+ }
+
var_dump(mysqli_set_charset($link, "euckr"));
if ('�Ǵ뼺\\\\�Ǵ뼺' !== ($tmp = mysqli_real_escape_string($link, '�Ǵ뼺\\�Ǵ뼺')))
@@ -48,6 +64,10 @@
mysqli_close($link);
print "done!";
?>
+--CLEAN--
+<?php
+ require_once("clean_table.inc");
+?>
--EXPECTF--
bool(true)
bool(true)
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt 2010-06-08 13:00:54 UTC (rev 300274)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt 2010-06-08 13:05:49 UTC (rev 300275)
@@ -22,8 +22,24 @@
<?php
require_once("connect.inc");
- require_once('table.inc');
+ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+{
+ printf("[001] Cannot connect to the server using host=%s, user=%s,
+passwd=***, dbname=%s, port=%s, socket=%s - [%d] %s\n", $host, $user, $db,
+$port, $socket, mysqli_connect_errno(), mysqli_connect_error());
+ }
+ if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
+ printf("Failed to drop old test table: [%d] %s\n", mysqli_errno($link),
+mysqli_error($link));
+ }
+
+ if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY
+KEY(id)) ENGINE=' . $engine . " DEFAULT CHARSET=gb2312")) {
+ printf("Failed to create test table: [%d] %s\n", mysqli_errno($link),
+mysqli_error($link));
+ }
+
var_dump(mysqli_set_charset($link, "gb2312"));
if ('����\\\\����' !== ($tmp = mysqli_real_escape_string($link, '����\\����')))
@@ -49,6 +65,10 @@
mysqli_close($link);
print "done!";
?>
+--CLEAN--
+<?php
+ require_once("clean_table.inc");
+?>
--EXPECTF--
bool(true)
bool(true)
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt 2010-06-08 13:00:54 UTC (rev 300274)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt 2010-06-08 13:05:49 UTC (rev 300275)
@@ -24,8 +24,24 @@
<?php
require_once("connect.inc");
- require_once('table.inc');
+ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+{
+ printf("[001] Cannot connect to the server using host=%s, user=%s,
+passwd=***, dbname=%s, port=%s, socket=%s - [%d] %s\n", $host, $user, $db,
+$port, $socket, mysqli_connect_errno(), mysqli_connect_error());
+ }
+ if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
+ printf("Failed to drop old test table: [%d] %s\n", mysqli_errno($link),
+mysqli_error($link));
+ }
+
+ if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY
+KEY(id)) ENGINE=' . $engine . " DEFAULT CHARSET=gbk")) {
+ printf("Failed to create test table: [%d] %s\n", mysqli_errno($link),
+mysqli_error($link));
+ }
+
var_dump(mysqli_set_charset($link, "gbk"));
if ('�İ汾\\\\�İ汾' !== ($tmp = mysqli_real_escape_string($link, '�İ汾\\�İ汾')))
@@ -51,6 +67,10 @@
mysqli_close($link);
print "done!";
?>
+--CLEAN--
+<?php
+ require_once("clean_table.inc");
+?>
--EXPECTF--
bool(true)
bool(true)
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt 2010-06-08 13:00:54 UTC (rev 300274)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt 2010-06-08 13:05:49 UTC (rev 300275)
@@ -79,6 +79,10 @@
print "done!";
?>
+--CLEAN--
+<?php
+ require_once("clean_table.inc");
+?>
--EXPECTF--
Warning: mysqli_real_escape_string(): Couldn't fetch mysqli in %s on line %d
done!
\ No newline at end of file
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt 2010-06-08 13:00:54 UTC (rev 300274)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt 2010-06-08 13:05:49 UTC (rev 300275)
@@ -5,6 +5,22 @@
require_once('skipif.inc');
require_once('skipifemb.inc');
require_once('skipifconnectfailure.inc');
+
+require_once("connect.inc");
+
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
+ die(sprintf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+ $host, $user, $db, $port, $socket));
+}
+
+if (!mysqli_query($link, "DROP TABLE IF EXISTS test") ||
+ !mysqli_query($link, "CREATE TABLE test(id SMALLINT)"))
+ die(sprintf("skip [%d] %s\n", $link->errno, $link->error));
+
+if (!...@mysqli_query("INSERT INTO test(id) VALUES (100001)"))
+ die("skip Strict sql mode seems to be active. We won't get a warning to check for.");
+
+mysqli_query($link, "DROP TABLE IF EXISTS test");
?>
--FILE--
<?php
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_types.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_types.phpt 2010-06-08 13:00:54 UTC (rev 300274)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_types.phpt 2010-06-08 13:05:49 UTC (rev 300275)
@@ -17,16 +17,20 @@
return false;
}
- $sql = sprintf("CREATE TABLE test(id %s)", $sql_type);
- if (!mysqli_query($link, $sql)) {
- printf("[002] %s, [%d] %s\n", $sql_type,
+ $create = sprintf("CREATE TABLE test(id %s)", $sql_type);
+ if (!mysqli_query($link, $create)) {
+ printf("[002] '%s' - '%s', [%d] %s\n", $sql_type, $create,
mysqli_errno($link), mysqli_error($link));
return false;
}
- $sql = sprintf("INSERT INTO test(id) VALUES ('%s')", $php_value);
+ if (is_string($php_value))
+ $sql = sprintf("INSERT INTO test(id) VALUES ('%s')", $php_value);
+ else
+ $sql = sprintf("INSERT INTO test(id) VALUES (%s)", $php_value);
+
if (!mysqli_query($link, $sql)) {
- printf("[003] %s, [%d] %s\n", $sql_type,
+ printf("[003] '%s' - '%s' - '%s', [%d] %s\n", $sql_type, $create, $sql,
mysqli_errno($link), mysqli_error($link));
return false;
}
@@ -85,7 +89,7 @@
MYSQLI_TYPE_VAR_STRING => array("VARCHAR(32768)", 'varchar'),
MYSQLI_TYPE_STRING => 'MYSQLI_TYPE_STRING - TODO add testing',
MYSQLI_TYPE_STRING => array('CHAR(1)', 'a'),
- MYSQLI_TYPE_STRING => array("SET('I', 'smash', 'the')", 'Will be converted to string although it is a SET...'),
+ MYSQLI_TYPE_STRING => array("SET('I', 'smash', 'the')", 'smash'),
MYSQLI_TYPE_NULL => 'MYSQLI_TYPE_NULL - TODO add testing',
MYSQLI_TYPE_NEWDATE => 'MYSQLI_TYPE_NEWDATE - TODO add testing',
MYSQLI_TYPE_INTERVAL => 'MYSQLI_TYPE_INTERVAL - TODO add testing',
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt 2010-06-08 13:00:54 UTC (rev 300274)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt 2010-06-08 13:05:49 UTC (rev 300275)
@@ -20,35 +20,62 @@
?>
--FILE--
<?php
-
require_once("connect.inc");
- require_once('table.inc');
+ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+{
+ printf("[001] Cannot connect to the server using host=%s, user=%s,
+passwd=***, dbname=%s, port=%s, socket=%s - [%d] %s\n", $host, $user, $db,
+$port, $socket, mysqli_connect_errno(), mysqli_connect_error());
+ }
+
+ if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
+ printf("Failed to drop old test table: [%d] %s\n", mysqli_errno($link),
+mysqli_error($link));
+ }
+
+ if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY
+KEY(id)) ENGINE=' . $engine . " DEFAULT CHARSET=big5")) {
+ printf("Failed to create test table: [%d] %s\n", mysqli_errno($link),
+mysqli_error($link));
+ }
+
var_dump(mysqli_set_charset($link, "big5"));
- if ('���H�U���e\\\\���H�U���e' !== ($tmp = mysqli_real_escape_string($link, '���H�U���e\\���H�U���e')))
+ if ('���H�U���e\\\\���H�U���e' !== ($tmp = mysqli_real_escape_string($link,
+'���H�U���e\\���H�U���e')))
printf("[004] Expecting \\\\, got %s\n", $tmp);
- if ('���H�U���e\"���H�U���e' !== ($tmp = mysqli_real_escape_string($link, '���H�U���e"���H�U���e')))
+ if ('���H�U���e\"���H�U���e' !== ($tmp = mysqli_real_escape_string($link,
+'���H�U���e"���H�U���e')))
printf("[005] Expecting \", got %s\n", $tmp);
- if ("���H�U���e\'���H�U���e" !== ($tmp = mysqli_real_escape_string($link, "���H�U���e'���H�U���e")))
+ if ("���H�U���e\'���H�U���e" !== ($tmp = mysqli_real_escape_string($link,
+"���H�U���e'���H�U���e")))
printf("[006] Expecting ', got %s\n", $tmp);
- if ("���H�U���e\\n���H�U���e" !== ($tmp = mysqli_real_escape_string($link, "���H�U���e\n���H�U���e")))
+ if ("���H�U���e\\n���H�U���e" !== ($tmp = mysqli_real_escape_string($link,
+"���H�U���e\n���H�U���e")))
printf("[007] Expecting \\n, got %s\n", $tmp);
- if ("���H�U���e\\r���H�U���e" !== ($tmp = mysqli_real_escape_string($link, "���H�U���e\r���H�U���e")))
+ if ("���H�U���e\\r���H�U���e" !== ($tmp = mysqli_real_escape_string($link,
+"���H�U���e\r���H�U���e")))
printf("[008] Expecting \\r, got %s\n", $tmp);
- if ("���H�U���e\\0���H�U���e" !== ($tmp = mysqli_real_escape_string($link, "���H�U���e" . chr(0) . "���H�U���e")))
+ if ("���H�U���e\\0���H�U���e" !== ($tmp = mysqli_real_escape_string($link, "���H�U���e"
+. chr(0) . "���H�U���e")))
printf("[009] Expecting %s, got %s\n", "���H�U���e\\0���H�U���e", $tmp);
- var_dump(mysqli_query($link, "INSERT INTO test(id, label) VALUES (100, '��')"));
+ var_dump(mysqli_query($link, "INSERT INTO test(id, label) VALUES (100,
+'��')"));
mysqli_close($link);
print "done!";
?>
+--CLEAN--
+<?php
+ require_once("clean_table.inc");
+?>
--EXPECTF--
bool(true)
bool(true)
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt 2010-06-08 13:00:54 UTC (rev 300274)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt 2010-06-08 13:05:49 UTC (rev 300275)
@@ -20,9 +20,26 @@
?>
--FILE--
<?php
- require_once("connect.inc");
- require_once('table.inc');
+require_once("connect.inc");
+ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+{
+ printf("[001] Cannot connect to the server using host=%s, user=%s,
+passwd=***, dbname=%s, port=%s, socket=%s - [%d] %s\n", $host, $user, $db,
+$port, $socket, mysqli_connect_errno(), mysqli_connect_error());
+ }
+
+ if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
+ printf("Failed to drop old test table: [%d] %s\n", mysqli_errno($link),
+mysqli_error($link));
+ }
+
+ if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY
+KEY(id)) ENGINE=' . $engine . " DEFAULT CHARSET=eucjpms")) {
+ printf("Failed to create test table: [%d] %s\n", mysqli_errno($link),
+mysqli_error($link));
+ }
+
var_dump(mysqli_set_charset($link, "eucjpms"));
if ('�����Ȥ߹�碌�Ǥ�\\\\�����Ȥ߹�碌�Ǥ�' !== ($tmp = mysqli_real_escape_string($link, '�����Ȥ߹�碌�Ǥ�\\�����Ȥ߹�碌�Ǥ�')))
@@ -48,6 +65,10 @@
mysqli_close($link);
print "done!";
?>
+--CLEAN--
+<?php
+ require_once("clean_table.inc");
+?>
--EXPECTF--
bool(true)
bool(true)
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt 2010-06-08 13:00:54 UTC (rev 300274)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt 2010-06-08 13:05:49 UTC (rev 300275)
@@ -21,8 +21,24 @@
--FILE--
<?php
require_once("connect.inc");
- require_once('table.inc');
+ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+{
+ printf("[001] Cannot connect to the server using host=%s, user=%s,
+passwd=***, dbname=%s, port=%s, socket=%s - [%d] %s\n", $host, $user, $db,
+$port, $socket, mysqli_connect_errno(), mysqli_connect_error());
+ }
+ if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
+ printf("Failed to drop old test table: [%d] %s\n", mysqli_errno($link),
+mysqli_error($link));
+ }
+
+ if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY
+KEY(id)) ENGINE=' . $engine . " DEFAULT CHARSET=euckr")) {
+ printf("Failed to create test table: [%d] %s\n", mysqli_errno($link),
+mysqli_error($link));
+ }
+
var_dump(mysqli_set_charset($link, "euckr"));
if ('�Ǵ뼺\\\\�Ǵ뼺' !== ($tmp = mysqli_real_escape_string($link, '�Ǵ뼺\\�Ǵ뼺')))
@@ -48,6 +64,10 @@
mysqli_close($link);
print "done!";
?>
+--CLEAN--
+<?php
+ require_once("clean_table.inc");
+?>
--EXPECTF--
bool(true)
bool(true)
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt 2010-06-08 13:00:54 UTC (rev 300274)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt 2010-06-08 13:05:49 UTC (rev 300275)
@@ -22,8 +22,24 @@
<?php
require_once("connect.inc");
- require_once('table.inc');
+ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+{
+ printf("[001] Cannot connect to the server using host=%s, user=%s,
+passwd=***, dbname=%s, port=%s, socket=%s - [%d] %s\n", $host, $user, $db,
+$port, $socket, mysqli_connect_errno(), mysqli_connect_error());
+ }
+ if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
+ printf("Failed to drop old test table: [%d] %s\n", mysqli_errno($link),
+mysqli_error($link));
+ }
+
+ if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY
+KEY(id)) ENGINE=' . $engine . " DEFAULT CHARSET=gb2312")) {
+ printf("Failed to create test table: [%d] %s\n", mysqli_errno($link),
+mysqli_error($link));
+ }
+
var_dump(mysqli_set_charset($link, "gb2312"));
if ('����\\\\����' !== ($tmp = mysqli_real_escape_string($link, '����\\����')))
@@ -49,6 +65,10 @@
mysqli_close($link);
print "done!";
?>
+--CLEAN--
+<?php
+ require_once("clean_table.inc");
+?>
--EXPECTF--
bool(true)
bool(true)
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt 2010-06-08 13:00:54 UTC (rev 300274)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt 2010-06-08 13:05:49 UTC (rev 300275)
@@ -24,8 +24,24 @@
<?php
require_once("connect.inc");
- require_once('table.inc');
+ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+{
+ printf("[001] Cannot connect to the server using host=%s, user=%s,
+passwd=***, dbname=%s, port=%s, socket=%s - [%d] %s\n", $host, $user, $db,
+$port, $socket, mysqli_connect_errno(), mysqli_connect_error());
+ }
+ if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
+ printf("Failed to drop old test table: [%d] %s\n", mysqli_errno($link),
+mysqli_error($link));
+ }
+
+ if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY
+KEY(id)) ENGINE=' . $engine . " DEFAULT CHARSET=gbk")) {
+ printf("Failed to create test table: [%d] %s\n", mysqli_errno($link),
+mysqli_error($link));
+ }
+
var_dump(mysqli_set_charset($link, "gbk"));
if ('�İ汾\\\\�İ汾' !== ($tmp = mysqli_real_escape_string($link, '�İ汾\\�İ汾')))
@@ -51,6 +67,10 @@
mysqli_close($link);
print "done!";
?>
+--CLEAN--
+<?php
+ require_once("clean_table.inc");
+?>
--EXPECTF--
bool(true)
bool(true)
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt 2010-06-08 13:00:54 UTC (rev 300274)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt 2010-06-08 13:05:49 UTC (rev 300275)
@@ -79,6 +79,10 @@
print "done!";
?>
+--CLEAN--
+<?php
+ require_once("clean_table.inc");
+?>
--EXPECTF--
Warning: mysqli_real_escape_string(): Couldn't fetch mysqli in %s on line %d
done!
\ No newline at end of file
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt 2010-06-08 13:00:54 UTC (rev 300274)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt 2010-06-08 13:05:49 UTC (rev 300275)
@@ -5,6 +5,22 @@
require_once('skipif.inc');
require_once('skipifemb.inc');
require_once('skipifconnectfailure.inc');
+
+require_once("connect.inc");
+
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
+ die(sprintf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+ $host, $user, $db, $port, $socket));
+}
+
+if (!mysqli_query($link, "DROP TABLE IF EXISTS test") ||
+ !mysqli_query($link, "CREATE TABLE test(id SMALLINT)"))
+ die(sprintf("skip [%d] %s\n", $link->errno, $link->error));
+
+if (!...@mysqli_query("INSERT INTO test(id) VALUES (100001)"))
+ die("skip Strict sql mode seems to be active. We won't get a warning to check for.");
+
+mysqli_query($link, "DROP TABLE IF EXISTS test");
?>
--FILE--
<?php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
