uw Wed Jul 11 15:17:47 2007 UTC
Modified files:
/php-src/ext/mysql/tests mysql_insert_id.phpt mysql_list_dbs.phpt
Log:
Whitespace and new checks for default connection.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_insert_id.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_insert_id.phpt
diff -u php-src/ext/mysql/tests/mysql_insert_id.phpt:1.1
php-src/ext/mysql/tests/mysql_insert_id.phpt:1.2
--- php-src/ext/mysql/tests/mysql_insert_id.phpt:1.1 Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_insert_id.phpt Wed Jul 11 15:17:47 2007
@@ -2,53 +2,60 @@
mysql_insert_id()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
--FILE--
<?php
- include "connect.inc";
+include "connect.inc";
- $tmp = NULL;
- $link = NULL;
-
- if (false !== ($tmp = @mysql_insert_id()))
- printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
-
- if (false !== ($tmp = @mysql_insert_id($link)))
- printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
-
- require('table.inc');
-
- if (0 !== ($tmp = mysql_insert_id($link)))
- printf("[003] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);
-
- if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 1",
$link)) {
- printf("[004] [%d] %s\n", mysql_errno($link), mysql_error($link));
- }
- if (0 !== ($tmp = mysql_insert_id($link)))
- printf("[005] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);
- mysql_free_result($res);
-
- // no auto_increment column
- if (!$res = mysql_query("INSERT INTO test(id, label) VALUES (100, 'a')",
$link)) {
- printf("[006] [%d] %s\n", mysql_errno($link), mysql_error($link));
- }
- if (0 !== ($tmp = mysql_insert_id($link)))
- printf("[007] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);
-
- if (!$res = mysql_query("ALTER TABLE test MODIFY id INT NOT NULL
AUTO_INCREMENT", $link)) {
- printf("[008] [%d] %s\n", mysql_errno($link), mysql_error($link));
- }
- if (!$res = mysql_query("INSERT INTO test(label) VALUES ('a')", $link)) {
- printf("[009] [%d] %s\n", mysql_errno($link), mysql_error($link));
- }
- if (0 === ($tmp = mysql_insert_id($link)))
- printf("[010] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);
-
- mysql_close($link);
-
- var_dump(mysql_insert_id($link));
-
- print "done!";
+$tmp = NULL;
+$link = NULL;
+
+if (false !== ($tmp = @mysql_insert_id()))
+ printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
+
+if (false !== ($tmp = @mysql_insert_id($link)))
+ printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
+
+if (!is_null($tmp = @mysql_insert_id($link, 'too many args')))
+ printf("[002a] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+
+if (0 !== ($tmp = mysql_insert_id($link)))
+ printf("[003] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 1",
$link)) {
+ printf("[004] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+if (0 !== ($tmp = mysql_insert_id($link)))
+ printf("[005] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);
+mysql_free_result($res);
+
+// no auto_increment column
+if (!$res = mysql_query("INSERT INTO test(id, label) VALUES (100, 'a')",
$link)) {
+ printf("[006] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+if (0 !== ($tmp = mysql_insert_id($link)))
+ printf("[007] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!$res = mysql_query("ALTER TABLE test MODIFY id INT NOT NULL
AUTO_INCREMENT", $link)) {
+ printf("[008] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+if (!$res = mysql_query("INSERT INTO test(label) VALUES ('a')", $link)) {
+ printf("[009] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+if (0 === ($tmp = mysql_insert_id($link)))
+ printf("[010] Expecting int/not zero, got %s/%s\n", gettype($tmp),
$tmp);
+
+if ($tmp !== ($tmp2 = mysql_insert_id()))
+ printf("[011] Expecting %s/%s, got %s/%s\n",
+ gettype($tmp), $tmp,
+ gettype($tmp2), $tmp2);
+
+mysql_close($link);
+
+var_dump(mysql_insert_id($link));
+
+print "done!";
?>
--EXPECTF--
Warning: mysql_insert_id(): %d is not a valid MySQL-Link resource in %s on
line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_list_dbs.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_list_dbs.phpt
diff -u php-src/ext/mysql/tests/mysql_list_dbs.phpt:1.1
php-src/ext/mysql/tests/mysql_list_dbs.phpt:1.2
--- php-src/ext/mysql/tests/mysql_list_dbs.phpt:1.1 Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_list_dbs.phpt Wed Jul 11 15:17:47 2007
@@ -4,35 +4,44 @@
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
- include_once "connect.inc";
+include_once "connect.inc";
- $tmp = NULL;
- $link = NULL;
-
- if (false !== ($tmp = @mysql_list_dbs(NULL)))
- printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
-
- if (NULL !== ($tmp = @mysql_list_dbs($link, $link)))
- printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-
- require('table.inc');
-
- if (!$res = mysql_list_dbs($link))
- printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
-
- if (!$num = mysql_num_rows($res))
- printf("[004] Empty database list? [%d] %s\n", mysql_errno($link),
mysql_error($link));
-
- $row = mysql_fetch_array($res, MYSQL_NUM);
- if (ini_get('unicode.semantics') && !is_unicode($row[0])) {
- printf("[005] Check for unicode support\n");
- var_inspect($row);
- }
-
- mysql_free_result($res);
- mysql_close($link);
-
- print "done!\n";
+$tmp = NULL;
+$link = NULL;
+
+if (false !== ($tmp = @mysql_list_dbs(NULL)))
+ printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
+
+if (NULL !== ($tmp = @mysql_list_dbs($link, $link)))
+ printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+
+if (!$res = mysql_list_dbs($link))
+ printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!$num = mysql_num_rows($res))
+ printf("[004] Empty database list? [%d] %s\n", mysql_errno($link),
mysql_error($link));
+
+$row = mysql_fetch_array($res, MYSQL_NUM);
+if (ini_get('unicode.semantics') && !is_unicode($row[0])) {
+ printf("[005] Check for unicode support\n");
+ var_inspect($row);
+}
+
+mysql_free_result($res);
+
+if (!$res2 = mysql_list_dbs())
+ printf("[006] [%d] %s\n", mysql_errno(), mysql_error());
+
+$row2 = mysql_fetch_array($res2, MYSQL_NUM);
+mysql_free_result($res2);
+
+assert($row === $row2);
+
+mysql_close($link);
+
+print "done!\n";
?>
--EXPECTF--
done!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
