uw Thu Jul 12 13:35:16 2007 UTC
Modified files:
/php-src/ext/mysql/tests mysql_tablename.phpt
Log:
1) Whitespace/CS
2) Added: skip test with mysqlnd, mysqlnd does not support this function
currently
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_tablename.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_tablename.phpt
diff -u php-src/ext/mysql/tests/mysql_tablename.phpt:1.1
php-src/ext/mysql/tests/mysql_tablename.phpt:1.2
--- php-src/ext/mysql/tests/mysql_tablename.phpt:1.1 Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_tablename.phpt Thu Jul 12 13:35:16 2007
@@ -1,43 +1,47 @@
--TEST--
mysql_tablename()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('connect.inc');
+if ($IS_MYSQLND && !function_exists('mysql_tablename'))
+ die("skip - deprecated function not implemented in mysqlnd");
+?>
--FILE--
<?php
- include "connect.inc";
+include "connect.inc";
+
+$tmp = NULL;
+$link = NULL;
+
+if (!is_null($tmp = @mysql_tablename()))
+ printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (null !== ($tmp = @mysql_tablename($link)))
+ printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 2",
$link)) {
+ printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+if (NULL !== ($tmp = mysql_tablename($res)))
+ printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = mysql_tablename($res, -1)))
+ printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
+
+var_dump(mysql_tablename($res, 0));
+
+if (false !== ($tmp = mysql_tablename($res, 2)))
+ printf("[00%d] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
+
+mysql_free_result($res);
+
+var_dump(mysql_tablename($res, 0));
- $tmp = NULL;
- $link = NULL;
-
- if (!is_null($tmp = @mysql_tablename()))
- printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-
- if (null !== ($tmp = @mysql_tablename($link)))
- printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-
- require('table.inc');
- if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 2",
$link)) {
- printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
- }
-
- if (NULL !== ($tmp = mysql_tablename($res)))
- printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-
- if (false !== ($tmp = mysql_tablename($res, -1)))
- printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
-
- var_dump(mysql_tablename($res, 0));
-
- if (false !== ($tmp = mysql_tablename($res, 2)))
- printf("[00%d] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
-
- mysql_free_result($res);
-
- var_dump(mysql_tablename($res, 0));
-
- mysql_close($link);
- print "done!";
+mysql_close($link);
+print "done!";
?>
--EXPECTF--
Warning: Wrong parameter count for mysql_tablename() in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
