uw Wed Jul 11 12:50:35 2007 UTC
Modified files:
/php-src/ext/mysql/tests mysql_db_query.phpt
Log:
Whitespace/Coding Standards.
Test for default link added.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_db_query.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_db_query.phpt
diff -u php-src/ext/mysql/tests/mysql_db_query.phpt:1.1
php-src/ext/mysql/tests/mysql_db_query.phpt:1.2
--- php-src/ext/mysql/tests/mysql_db_query.phpt:1.1 Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_db_query.phpt Wed Jul 11 12:50:34 2007
@@ -4,40 +4,55 @@
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
- include "connect.inc";
-
- // NOTE: this function is deprecated. We do only the most necessary
- // to test it. We don't test all aspects of the documented behaviour.
-
- $tmp = NULL;
- $link = NULL;
-
- if (NULL !== ($tmp = @mysql_db_query()))
- printf("[001] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp);
-
- if (NULL !== ($tmp = @mysql_db_query($link)))
- printf("[002] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp);
-
- if (NULL !== ($tmp = @mysql_db_query($link)))
- printf("[003] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp);
-
- require('table.inc');
- if (!$res = mysql_db_query($db, 'SELECT id, label FROM test ORDER BY id
LIMIT 1', $link))
- printf("[004] [%d] %s\n", mysql_errno($link), mysql_error($link));
-
- $row = mysql_fetch_assoc($res);
- if (1 != $row['id'])
- printf("[005] Expecting record 1/a, got record %s/%s\n", $row['id'],
$row['label']);
-
- if (ini_get('unicode.semantics') && !is_unicode($row['label'])) {
- printf("[006] No unicode returned! [%d] %s\n", mysql_errno($link),
mysql_error($link));
- var_inspect($row);
- }
-
- mysql_free_result($res);
- mysql_close($link);
+include "connect.inc";
- print "done!\n";
+// NOTE: this function is deprecated. We do only the most necessary
+// to test it. We don't test all aspects of the documented behaviour.
+
+$tmp = NULL;
+$link = NULL;
+
+if (NULL !== ($tmp = @mysql_db_query()))
+ printf("[001] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (NULL !== ($tmp = @mysql_db_query($link)))
+ printf("[002] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (NULL !== ($tmp = @mysql_db_query($link)))
+ printf("[003] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_db_query($db, 'SELECT id, label FROM test ORDER BY id LIMIT
1', $link))
+ printf("[004] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+$row = mysql_fetch_assoc($res);
+if (1 != $row['id'])
+ printf("[005] Expecting record 1/a, got record %s/%s\n", $row['id'],
$row['label']);
+
+if (ini_get('unicode.semantics') && !is_unicode($row['label'])) {
+ printf("[006] No unicode returned! [%d] %s\n", mysql_errno($link),
mysql_error($link));
+ var_inspect($row);
+}
+
+mysql_free_result($res);
+
+
+if (!$res = mysql_db_query($db, 'SELECT id, label FROM test ORDER BY id LIMIT
1'))
+ printf("[007] [%d] %s\n", mysql_errno(), mysql_error());
+
+$row = mysql_fetch_assoc($res);
+if (1 != $row['id'])
+ printf("[008] Expecting record 1/a, got record %s/%s\n", $row['id'],
$row['label']);
+
+if (ini_get('unicode.semantics') && !is_unicode($row['label'])) {
+ printf("[009] No unicode returned! [%d] %s\n", mysql_errno(),
mysql_error());
+ var_inspect($row);
+}
+
+mysql_free_result($res);
+mysql_close($link);
+
+print "done!\n";
?>
--EXPECTF--
done!
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
