[PHP-CVS] cvs: php-src /ext/mysqli/tests 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008.phpt 009.phpt 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt 015.phpt 017.phpt 019.phpt 020.phpt 021.ph
uw Tue Jan 8 12:43:09 2008 UTC
Modified files:
/php-src/ext/mysqli/tests 002.phpt 003.phpt 004.phpt 005.phpt
006.phpt 007.phpt 008.phpt 009.phpt
010.phpt 011.phpt 012.phpt 013.phpt
014.phpt 015.phpt 017.phpt 019.phpt
020.phpt 021.phpt 022.phpt 023.phpt
024.phpt 025.phpt 026.phpt 029.phpt
030.phpt 031.phpt 032.phpt 036.phpt
037.phpt 038.phpt 039.phpt 040.phpt
042.phpt 043.phpt 046.phpt 047.phpt
048.phpt 061.phpt
Log:
Looks more than it is. Its whitespace, adding error handling in a few places,
changing SQL statement formatting etc. No real changes.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/002.phpt?r1=1.9r2=1.10diff_format=u
Index: php-src/ext/mysqli/tests/002.phpt
diff -u php-src/ext/mysqli/tests/002.phpt:1.9
php-src/ext/mysqli/tests/002.phpt:1.10
--- php-src/ext/mysqli/tests/002.phpt:1.9 Thu Aug 9 08:41:11 2007
+++ php-src/ext/mysqli/tests/002.phpt Tue Jan 8 12:43:08 2008
@@ -1,8 +1,8 @@
--TEST--
mysqli bind_result 1
--SKIPIF--
-?php
-require_once('skipif.inc');
+?php
+require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?
--FILE--
@@ -42,6 +42,7 @@
var_dump($test);
mysqli_stmt_close($stmt);
+ @mysqli_query($link, DROP TABLE IF EXISTS test_fetch_null);
mysqli_close($link);
print done!;
?
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/003.phpt?r1=1.10r2=1.11diff_format=u
Index: php-src/ext/mysqli/tests/003.phpt
diff -u php-src/ext/mysqli/tests/003.phpt:1.10
php-src/ext/mysqli/tests/003.phpt:1.11
--- php-src/ext/mysqli/tests/003.phpt:1.10 Fri Dec 28 18:19:17 2007
+++ php-src/ext/mysqli/tests/003.phpt Tue Jan 8 12:43:08 2008
@@ -68,6 +68,7 @@
var_dump($test);
mysqli_stmt_close($stmt);
+ mysqli_query($link, DROP TABLE IF EXISTS test_bind_result);
mysqli_close($link);
print done!;
?
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/004.phpt?r1=1.8r2=1.9diff_format=u
Index: php-src/ext/mysqli/tests/004.phpt
diff -u php-src/ext/mysqli/tests/004.phpt:1.8
php-src/ext/mysqli/tests/004.phpt:1.9
--- php-src/ext/mysqli/tests/004.phpt:1.8 Thu Aug 9 08:41:11 2007
+++ php-src/ext/mysqli/tests/004.phpt Tue Jan 8 12:43:08 2008
@@ -1,8 +1,8 @@
--TEST--
-mysqli fetch char/text
+mysqli fetch char/text
--SKIPIF--
-?php
-require_once('skipif.inc');
+?php
+require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?
--FILE--
@@ -16,7 +16,7 @@
if (!mysqli_query($link,DROP TABLE IF EXISTS test_bind_fetch))
printf([001] [%d] string\n, mysqli_errno($link),
mysqli_error($link));
-
+
if (!mysqli_query($link,CREATE TABLE test_bind_fetch(c1 char(10), c2
text) ENGINE= . $engine))
printf([002] [%d] string\n, mysqli_errno($link),
mysqli_error($link));
@@ -43,6 +43,7 @@
}
mysqli_stmt_close($stmt);
+ mysqli_query($link, DROP TABLE IF EXISTS test_bind_fetch);
mysqli_close($link);
print done!;
?
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/005.phpt?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/mysqli/tests/005.phpt
diff -u php-src/ext/mysqli/tests/005.phpt:1.7
php-src/ext/mysqli/tests/005.phpt:1.8
--- php-src/ext/mysqli/tests/005.phpt:1.7 Thu Aug 9 08:41:12 2007
+++ php-src/ext/mysqli/tests/005.phpt Tue Jan 8 12:43:08 2008
@@ -1,20 +1,20 @@
--TEST--
-mysqli fetch char/text long
+mysqli fetch char/text long
--SKIPIF--
-?php
-require_once('skipif.inc');
+?php
+require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?
--FILE--
?php
include connect.inc;
-
+
/*** test mysqli_connect 127.0.0.1 ***/
$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
if (!mysqli_query($link, DROP TABLE IF EXISTS test_bind_fetch))
printf([001] [%d] %s\n, mysqli_errno($link),
mysqli_error($link));
-
+
if (!mysqli_query($link, CREATE TABLE test_bind_fetch(c1 char(10), c2
text) ENGINE= . $engine))
printf([002] [%d] %s\n, mysqli_errno($link),
mysqli_error($link));
@@ -33,6 +33,7 @@
var_dump($test);
mysqli_stmt_close($stmt);
+ mysqli_query($link, DROP TABLE IF EXISTS test_bind_fetch);
mysqli_close($link);
print done!;
?
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/006.phpt?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/mysqli/tests/006.phpt
diff -u php-src/ext/mysqli/tests/006.phpt:1.7
php-src/ext/mysqli/tests/006.phpt:1.8
--- php-src/ext/mysqli/tests/006.phpt:1.7 Thu Aug 9 08:41:12 2007
+++ php-src/ext/mysqli/tests/006.phpt
[PHP-CVS] cvs: php-src /ext/mysqli/tests 002.phpt
uw Thu Jul 12 20:31:18 2007 UTC
Modified files:
/php-src/ext/mysqli/tests 002.phpt
Log:
More typical changes:
1) Try to have portable SQL, don't create your own schema unless the test
wants to test exactly this
2) Don't rely on default SQL sort orders
3) Use proper UEXPECTF. There have been a lot of tiny unicode issues when
ext/mysqli has returned a binary string in unicode mode although a
unicode string could be expected and vice versa
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/002.phpt?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/mysqli/tests/002.phpt
diff -u php-src/ext/mysqli/tests/002.phpt:1.6
php-src/ext/mysqli/tests/002.phpt:1.7
--- php-src/ext/mysqli/tests/002.phpt:1.6 Tue Sep 26 13:06:13 2006
+++ php-src/ext/mysqli/tests/002.phpt Thu Jul 12 20:31:18 2007
@@ -7,23 +7,28 @@
include connect.inc;
/*** test mysqli_connect 127.0.0.1 ***/
- $link = mysqli_connect($host, $user, $passwd);
-$link-query(CREATE SCHEMA test);
+ if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+ printf([001] [%d] %s\n, mysqli_connect_errno(),
mysqli_connect_error());
- mysqli_select_db($link, test);
- $rc = mysqli_query($link,DROP TABLE IF EXISTS test_fetch_null);
+ if (!mysqli_query($link, DROP TABLE IF EXISTS test_fetch_null))
+ printf([002] Cannot drop table, [%d] %s\n,
mysqli_errno($link), mysqli_error($link));
- $rc = mysqli_query($link,CREATE TABLE test_fetch_null(col1 tinyint,
col2 smallint,
- col3 int, col4 bigint,
- col5 float, col6 double,
- col7 date, col8 time,
- col9 varbinary(10),
- col10 varchar(50),
- col11 char(20)));
+ $rc = mysqli_query($link,CREATE TABLE test_fetch_null(col1 tinyint,
col2 smallint,
+
col3 int, col4 bigint,
+
col5 float, col6 double,
+
col7 date, col8 time,
+
col9 varbinary(10),
+
col10 varchar(50),
+
col11 char(20)) ENGINE= . $engine);
+
+ if (!$rc)
+ printf([003] Cannot create table, [%d] %s\n,
mysqli_errno($link), mysqli_error($link));
- $rc = mysqli_query($link,INSERT INTO test_fetch_null(col1,col10,
col11) VALUES(1,'foo1', 1000),(2,'foo2', 88),(3,'foo3', 389789));
+ $rc = mysqli_query($link, INSERT INTO test_fetch_null(col1,col10,
col11) VALUES(1,'foo1', 1000),(2,'foo2', 88),(3,'foo3', 389789));
+ if (!$rc)
+ printf([004] Cannot insert records, [%d] %s\n,
mysqli_errno($link), mysqli_error($link));
- $stmt = mysqli_prepare($link, SELECT col1, col2, col3, col4, col5,
col6, col7, col8, col9, col10, col11 from test_fetch_null);
+ $stmt = mysqli_prepare($link, SELECT col1, col2, col3, col4, col5,
col6, col7, col8, col9, col10, col11 from test_fetch_null ORDER BY col1);
mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8, $c9,
$c10, $c11);
mysqli_execute($stmt);
@@ -35,6 +40,7 @@
mysqli_stmt_close($stmt);
mysqli_close($link);
+ print done!;
?
--EXPECTF--
array(11) {
@@ -57,7 +63,34 @@
[8]=
NULL
[9]=
- %s(4) foo1
+ string(4) foo1
+ [10]=
+ string(4) 1000
+}
+done!
+--UEXPECTF--
+array(11) {
+ [0]=
+ int(1)
+ [1]=
+ NULL
+ [2]=
+ NULL
+ [3]=
+ NULL
+ [4]=
+ NULL
+ [5]=
+ NULL
+ [6]=
+ NULL
+ [7]=
+ NULL
+ [8]=
+ NULL
+ [9]=
+ unicode(4) foo1
[10]=
- %s(4) 1000
+ unicode(4) 1000
}
+done!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli/tests 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008.phpt 009.phpt 010.phpt 011.phpt 012.phpt 013.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt 021.phpt 022.phpt 023.phpt 024.phpt 025.phpt 026.phpt 042.phpt 043.phpt 045.phpt 046.phpt 048.phpt
georg Sat Jun 28 17:30:58 2003 EDT
Modified files:
/php-src/ext/mysqli/tests 002.phpt 003.phpt 004.phpt 005.phpt
006.phpt 007.phpt 008.phpt 009.phpt
010.phpt 011.phpt 012.phpt 013.phpt
016.phpt 017.phpt 018.phpt 019.phpt
020.phpt 021.phpt 022.phpt 023.phpt
024.phpt 025.phpt 026.phpt 042.phpt
043.phpt 045.phpt 046.phpt 048.phpt
Log:
changed tests (ysqli_bind_param and mysql_bind_result changes)
Index: php-src/ext/mysqli/tests/002.phpt
diff -u php-src/ext/mysqli/tests/002.phpt:1.1 php-src/ext/mysqli/tests/002.phpt:1.2
--- php-src/ext/mysqli/tests/002.phpt:1.1 Tue Feb 11 19:46:29 2003
+++ php-src/ext/mysqli/tests/002.phpt Sat Jun 28 17:30:58 2003
@@ -21,7 +21,7 @@
$rc = mysqli_query($link,INSERT INTO test_fetch_null(col1,col10, col11)
VALUES(1,'foo1', 1000),(2,'foo2', 88),(3,'foo3', 389789));
$stmt = mysqli_prepare($link, SELECT col1, col2, col3, col4, col5, col6,
col7, col8, col9, col10, col11 from test_fetch_null);
- mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8,
$c9, $c10, $c11);
+ mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8, $c9, $c10,
$c11);
mysqli_execute($stmt);
mysqli_fetch($stmt);
Index: php-src/ext/mysqli/tests/003.phpt
diff -u php-src/ext/mysqli/tests/003.phpt:1.1 php-src/ext/mysqli/tests/003.phpt:1.2
--- php-src/ext/mysqli/tests/003.phpt:1.1 Tue Feb 11 19:46:29 2003
+++ php-src/ext/mysqli/tests/003.phpt Sat Jun 28 17:30:58 2003
@@ -24,9 +24,9 @@
'2010-07-10',
'2020','1999-12-29'));
- $stmt = mysqli_prepare($link, SELECT * FROM test_bind_result);
- mysqli_bind_result($stmt,$c1, $c2, $c3, $c4, $c5, $c6, $c7);
+ $stmt = mysqli_prepare($link, SELECT * FROM test_bind_result);
+ mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
mysqli_execute($stmt);
mysqli_fetch($stmt);
Index: php-src/ext/mysqli/tests/004.phpt
diff -u php-src/ext/mysqli/tests/004.phpt:1.1 php-src/ext/mysqli/tests/004.phpt:1.2
--- php-src/ext/mysqli/tests/004.phpt:1.1 Tue Feb 11 19:46:29 2003
+++ php-src/ext/mysqli/tests/004.phpt Sat Jun 28 17:30:58 2003
@@ -15,7 +15,7 @@
mysqli_query($link, INSERT INTO test_bind_fetch VALUES ('1234567890', 'this
is a test'));
$stmt = mysqli_prepare($link, SELECT * FROM test_bind_fetch);
- mysqli_bind_result($stmt, $c1, $c2);
+ mysqli_bind_result($stmt, $c1, $c2);
mysqli_execute($stmt);
mysqli_fetch($stmt);
Index: php-src/ext/mysqli/tests/005.phpt
diff -u php-src/ext/mysqli/tests/005.phpt:1.1 php-src/ext/mysqli/tests/005.phpt:1.2
--- php-src/ext/mysqli/tests/005.phpt:1.1 Tue Feb 11 19:46:29 2003
+++ php-src/ext/mysqli/tests/005.phpt Sat Jun 28 17:30:58 2003
@@ -17,7 +17,7 @@
mysqli_query($link, INSERT INTO test_bind_fetch VALUES ('1234567890', '$a'));
$stmt = mysqli_prepare($link, SELECT * FROM test_bind_fetch);
- mysqli_bind_result($stmt, $c1, $c2);
+ mysqli_bind_result($stmt, $c1, $c2);
mysqli_execute($stmt);
mysqli_fetch($stmt);
Index: php-src/ext/mysqli/tests/006.phpt
diff -u php-src/ext/mysqli/tests/006.phpt:1.1 php-src/ext/mysqli/tests/006.phpt:1.2
--- php-src/ext/mysqli/tests/006.phpt:1.1 Tue Feb 11 19:46:29 2003
+++ php-src/ext/mysqli/tests/006.phpt Sat Jun 28 17:30:58 2003
@@ -21,7 +21,7 @@
mysqli_query($link, INSERT INTO test_bind_fetch VALUES
(-23,35999,NULL,-500,-999,-0,0));
$stmt = mysqli_prepare($link, SELECT * FROM test_bind_fetch);
- mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
+ mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
mysqli_execute($stmt);
mysqli_fetch($stmt);
Index: php-src/ext/mysqli/tests/007.phpt
diff -u php-src/ext/mysqli/tests/007.phpt:1.1 php-src/ext/mysqli/tests/007.phpt:1.2
--- php-src/ext/mysqli/tests/007.phpt:1.1 Tue Feb 11 19:46:29 2003
+++ php-src/ext/mysqli/tests/007.phpt Sat Jun 28 17:30:58 2003
@@ -21,7 +21,7 @@
mysqli_query($link, INSERT INTO test_bind_fetch VALUES
(-23,35999,NULL,-500,-999,+30,0));
$stmt = mysqli_prepare($link, SELECT * FROM test_bind_fetch);
- mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
+ mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
mysqli_execute($stmt);
mysqli_fetch($stmt);
Index: php-src/ext/mysqli/tests/008.phpt
diff -u php-src/ext/mysqli/tests/008.phpt:1.1 php-src/ext/mysqli/tests/008.phpt:1.2
--- php-src/ext/mysqli/tests/008.phpt:1.1 Tue Feb 11 19:46:29 2003
+++ php-src/ext/mysqli/tests/008.phpt Sat Jun 28
