uw Wed Jul 11 13:29:41 2007 UTC
Modified files:
/php-src/ext/mysql/tests mysql_fetch_assoc.phpt
Log:
Whitespace / Coding Standards
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_assoc.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_assoc.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.1
php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.2
--- php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.1 Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_fetch_assoc.phpt Wed Jul 11 13:29:41 2007
@@ -2,49 +2,48 @@
mysql_fetch_assoc()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
--FILE--
<?php
- include "connect.inc";
-
- $tmp = NULL;
- $link = NULL;
-
- // Note: no SQL type tests, internally the same function gets used as for
mysql_fetch_array() which does a lot of SQL type test
-
- if (!is_null($tmp = @mysql_fetch_assoc()))
- printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-
- if (false !== ($tmp = @mysql_fetch_assoc($link)))
- printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
-
- require('table.inc');
- 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));
- }
-
- print "[005]\n";
- var_dump(mysql_fetch_assoc($res));
-
- print "[006]\n";
- var_dump(mysql_fetch_assoc($res));
-
- mysql_free_result($res);
-
- if (!$res = mysql_query("SELECT 1 AS a, 2 AS a, 3 AS c, 4 AS C, NULL AS d,
true AS e", $link)) {
- printf("[007] Cannot run query, [%d] %s\n", mysql_errno($link),
$mysql_error($link));
- }
- print "[008]\n";
- var_dump(mysql_fetch_assoc($res));
-
- mysql_free_result($res);
-
- if (false !== ($tmp = mysql_fetch_assoc($res)))
- printf("[008] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
-
- mysql_close($link);
-
- print "done!";
+include "connect.inc";
+
+$tmp = NULL;
+$link = NULL;
+
+// Note: no SQL type tests, internally the same function gets used as for
mysql_fetch_array() which does a lot of SQL type test
+
+if (!is_null($tmp = @mysql_fetch_assoc()))
+ printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = @mysql_fetch_assoc($link)))
+ printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
+
+require('table.inc');
+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));
+}
+
+print "[005]\n";
+var_dump(mysql_fetch_assoc($res));
+
+print "[006]\n";
+var_dump(mysql_fetch_assoc($res));
+
+mysql_free_result($res);
+
+if (!$res = mysql_query("SELECT 1 AS a, 2 AS a, 3 AS c, 4 AS C, NULL AS d,
true AS e", $link)) {
+ printf("[007] Cannot run query, [%d] %s\n", mysql_errno($link),
$mysql_error($link));
+}
+print "[008]\n";
+var_dump(mysql_fetch_assoc($res));
+
+mysql_free_result($res);
+
+if (false !== ($tmp = mysql_fetch_assoc($res)))
+ printf("[008] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
+
+mysql_close($link);
+
+print "done!";
?>
--EXPECTF--
[005]
@@ -97,4 +96,4 @@
}
Warning: mysql_fetch_assoc(): %d is not a valid MySQL result resource in %s on
line %d
-done!
+done!
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
