uw Thu Jul 12 10:18:14 2007 UTC
Modified files:
/php-src/ext/mysql/tests mysql_num_rows.phpt
Log:
Whitespace/CS only
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_num_rows.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_num_rows.phpt
diff -u php-src/ext/mysql/tests/mysql_num_rows.phpt:1.1
php-src/ext/mysql/tests/mysql_num_rows.phpt:1.2
--- php-src/ext/mysql/tests/mysql_num_rows.phpt:1.1 Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_num_rows.phpt Thu Jul 12 10:18:14 2007
@@ -2,59 +2,57 @@
mysql_num_rows()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
--FILE--
<?php
- include "connect.inc";
-
- $tmp = NULL;
- $link = NULL;
-
- if (!is_null($tmp = @mysql_num_rows()))
- printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-
- if (false !== ($tmp = @mysql_num_rows($link)))
- printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
-
- require('table.inc');
-
- function func_test_mysql_num_rows($link, $query, $expected, $offset,
$test_free = false) {
-
- if (!$res = mysql_query($query, $link)) {
- printf("[%03d] [%d] %s\n", $offset, mysql_errno($link),
mysql_error($link));
- return;
- }
-
- if ($expected !== ($tmp = mysql_num_rows($res)))
- printf("[%03d] Expecting %s/%d, got %s/%d\n", $offset + 1,
- gettype($expected), $expected,
- gettype($tmp), $tmp);
-
- mysql_free_result($res);
-
- if ($test_free && (false !== ($tmp = mysql_num_rows($res))))
- printf("[%03d] Expecting boolean/false, got %s/%s\n", $offset + 2,
gettype($tmp), $tmp);
-
- }
-
- func_test_mysql_num_rows($link, "SELECT 1 AS a", 1, 5);
- func_test_mysql_num_rows($link, "SHOW VARIABLES LIKE '%nixnutz%'", 0, 10);
- func_test_mysql_num_rows($link, "INSERT INTO test(id, label) VALUES (100,
'z')", false, 15);
- func_test_mysql_num_rows($link, "SELECT id FROM test LIMIT 2", 2, 20,
true);
-
- if ($res = mysql_query('SELECT COUNT(id) AS num FROM test', $link)) {
-
- $row = mysql_fetch_assoc($res);
- mysql_free_result($res);
-
- func_test_mysql_num_rows($link, "SELECT id, label FROM test",
(int)$row['num'], 25);
-
- } else {
- printf("[030] [%d] %s\n", mysql_errno($link), mysql_error($link));
- }
-
- mysql_close($link);
- print "done!";
+include "connect.inc";
+
+$tmp = NULL;
+$link = NULL;
+
+if (!is_null($tmp = @mysql_num_rows()))
+printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = @mysql_num_rows($link)))
+printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+
+function func_test_mysql_num_rows($link, $query, $expected, $offset,
$test_free = false) {
+
+ if (!$res = mysql_query($query, $link)) {
+ printf("[%03d] [%d] %s\n", $offset, mysql_errno($link),
mysql_error($link));
+ return;
+ }
+
+ if ($expected !== ($tmp = mysql_num_rows($res)))
+ printf("[%03d] Expecting %s/%d, got %s/%d\n", $offset + 1,
+ gettype($expected), $expected,
+ gettype($tmp), $tmp);
+
+ mysql_free_result($res);
+
+ if ($test_free && (false !== ($tmp = mysql_num_rows($res))))
+ printf("[%03d] Expecting boolean/false, got %s/%s\n", $offset +
2, gettype($tmp), $tmp);
+}
+
+func_test_mysql_num_rows($link, "SELECT 1 AS a", 1, 5);
+func_test_mysql_num_rows($link, "SHOW VARIABLES LIKE '%nixnutz%'", 0, 10);
+func_test_mysql_num_rows($link, "INSERT INTO test(id, label) VALUES (100,
'z')", false, 15);
+func_test_mysql_num_rows($link, "SELECT id FROM test LIMIT 2", 2, 20, true);
+
+if ($res = mysql_query('SELECT COUNT(id) AS num FROM test', $link)) {
+
+ $row = mysql_fetch_assoc($res);
+ mysql_free_result($res);
+
+ func_test_mysql_num_rows($link, "SELECT id, label FROM test",
(int)$row['num'], 25);
+
+} else {
+ printf("[030] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+mysql_close($link);
+print "done!";
?>
--EXPECTF--
Warning: mysql_num_rows(): supplied argument is not a valid MySQL result
resource in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
