uw Wed Oct 10 10:07:46 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli/tests 020.phpt 021.phpt 022.phpt 023.phpt
024.phpt 025.phpt 026.phpt 027.phpt
028.phpt 029.phpt 030.phpt 031.phpt
032.phpt 033.phpt 034.phpt 035.phpt
036.phpt 037.phpt 038.phpt 039.phpt
Log:
Changes to 02*.phpt, 03*.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/020.phpt?r1=1.6.2.1&r2=1.6.2.1.4.1&diff_format=u
Index: php-src/ext/mysqli/tests/020.phpt
diff -u php-src/ext/mysqli/tests/020.phpt:1.6.2.1
php-src/ext/mysqli/tests/020.phpt:1.6.2.1.4.1
--- php-src/ext/mysqli/tests/020.phpt:1.6.2.1 Sat Oct 8 15:08:07 2005
+++ php-src/ext/mysqli/tests/020.phpt Wed Oct 10 10:07:46 2007
@@ -1,44 +1,51 @@
--TEST--
mysqli bind_param/bind_result date
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
+ /* NOTE: There's an option in mysqlnd which controls if data and
+ time are returned as unicode or not. Consider this if you consider
+ adding a UEXPECTF to the test. */
+
include "connect.inc";
-
+
/*** test mysqli_connect 127.0.0.1 ***/
- $link = mysqli_connect($host, $user, $passwd);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
- mysqli_select_db($link, "test");
+ mysqli_select_db($link, $db);
mysqli_query($link, "SET sql_mode=''");
-
+
mysqli_query($link,"DROP TABLE IF EXISTS test_bind_result");
- mysqli_query($link,"CREATE TABLE test_bind_result(c1 date, c2 time,
- c3 timestamp(14),
- c4 year,
- c5 datetime,
- c6 timestamp(4),
- c7 timestamp(6))");
+ mysqli_query($link,"CREATE TABLE test_bind_result(c1 date, c2 time,
+ c3 timestamp(14),
+ c4 year,
+ c5 datetime,
+ c6 timestamp(4),
+ c7 timestamp(6))");
$stmt = mysqli_prepare($link, "INSERT INTO test_bind_result VALUES
(?,?,?,?,?,?,?)");
mysqli_bind_param($stmt, "sssssss", $d1, $d2, $d3, $d4, $d5, $d6, $d7);
- $d1 = '2002-01-02';
- $d2 = '12:49:00';
- $d3 = '2002-01-02 17:46:59';
- $d4 = 2010;
- $d5 ='2010-07-10';
- $d6 = '2020';
- $d7 = '1999-12-29';
+ $d1 = "2002-01-02";
+ $d2 = "12:49:00";
+ $d3 = "2002-01-02 17:46:59";
+ $d4 = "2010";
+ $d5 = "2010-07-10";
+ $d6 = "2020";
+ $d7 = "1999-12-29";
mysqli_execute($stmt);
mysqli_stmt_close($stmt);
$stmt = mysqli_prepare($link, "SELECT * FROM test_bind_result");
- mysqli_bind_result($stmt,$c1, $c2, $c3, $c4, $c5, $c6, $c7);
-
- mysqli_execute($stmt);
+ mysqli_bind_result($stmt,$c1, $c2, $c3, $c4, $c5, $c6, $c7);
+
+ mysqli_execute($stmt);
mysqli_fetch($stmt);
$test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7);
@@ -47,21 +54,24 @@
mysqli_stmt_close($stmt);
mysqli_close($link);
+
+ print "done!";
?>
---EXPECT--
+--EXPECTF--
array(7) {
[0]=>
- string(10) "2002-01-02"
+ %s(10) "2002-01-02"
[1]=>
- string(8) "12:49:00"
+ %s(8) "12:49:00"
[2]=>
- string(19) "2002-01-02 17:46:59"
+ %s(19) "2002-01-02 17:46:59"
[3]=>
int(2010)
[4]=>
- string(19) "2010-07-10 00:00:00"
+ %s(19) "2010-07-10 00:00:00"
[5]=>
- string(19) "0000-00-00 00:00:00"
+ %s(19) "0000-00-00 00:00:00"
[6]=>
- string(19) "1999-12-29 00:00:00"
+ %s(19) "1999-12-29 00:00:00"
}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/021.phpt?r1=1.5&r2=1.5.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/021.phpt
diff -u php-src/ext/mysqli/tests/021.phpt:1.5
php-src/ext/mysqli/tests/021.phpt:1.5.6.1
--- php-src/ext/mysqli/tests/021.phpt:1.5 Sat Dec 4 08:50:33 2004
+++ php-src/ext/mysqli/tests/021.phpt Wed Oct 10 10:07:46 2007
@@ -1,18 +1,21 @@
--TEST--
-mysqli bind_param+bind_result char/text
+mysqli bind_param+bind_result char/text
--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);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
- mysqli_select_db($link, "test");
+ mysqli_select_db($link, $db);
- mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
- mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 char(10), c2
text)");
+ mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
+ mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 char(10), c2
text)");
$stmt = mysqli_prepare($link, "INSERT INTO test_bind_fetch VALUES
(?,?)");
mysqli_bind_param($stmt, "ss", $q1, $q2);
@@ -32,11 +35,21 @@
mysqli_stmt_close($stmt);
mysqli_close($link);
+ print "done!";
?>
---EXPECT--
+--EXPECTF--
array(2) {
[0]=>
string(10) "1234567890"
[1]=>
- string(14) "this is a test"
+ %s(14) "this is a test"
+}
+done!
+--UEXPECTF--
+array(2) {
+ [0]=>
+ unicode(10) "1234567890"
+ [1]=>
+ %s(14) "this is a test"
}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/022.phpt?r1=1.5&r2=1.5.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/022.phpt
diff -u php-src/ext/mysqli/tests/022.phpt:1.5
php-src/ext/mysqli/tests/022.phpt:1.5.6.1
--- php-src/ext/mysqli/tests/022.phpt:1.5 Sat Dec 4 08:50:33 2004
+++ php-src/ext/mysqli/tests/022.phpt Wed Oct 10 10:07:46 2007
@@ -1,18 +1,21 @@
--TEST--
-mysqli bind_param/bind_result char/text long
+mysqli bind_param/bind_result 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);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
- mysqli_select_db($link, "test");
+ mysqli_select_db($link, $db);
- mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
- mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 char(10), c2
text)");
+ mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
+ mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 char(10), c2
text)");
$stmt = mysqli_prepare($link, "INSERT INTO test_bind_fetch VALUES
(?,?)");
@@ -36,11 +39,22 @@
mysqli_stmt_close($stmt);
mysqli_close($link);
+
+ print "done!";
?>
---EXPECT--
+--EXPECTF--
array(2) {
[0]=>
string(10) "1234567890"
[1]=>
- string(13) "32K String ok"
+ %s(13) "32K String ok"
+}
+done!
+--UEXPECTF--
+array(2) {
+ [0]=>
+ unicode(10) "1234567890"
+ [1]=>
+ %s(13) "32K String ok"
}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/023.phpt?r1=1.5.2.1&r2=1.5.2.1.4.1&diff_format=u
Index: php-src/ext/mysqli/tests/023.phpt
diff -u php-src/ext/mysqli/tests/023.phpt:1.5.2.1
php-src/ext/mysqli/tests/023.phpt:1.5.2.1.4.1
--- php-src/ext/mysqli/tests/023.phpt:1.5.2.1 Sat Oct 8 15:08:07 2005
+++ php-src/ext/mysqli/tests/023.phpt Wed Oct 10 10:07:46 2007
@@ -1,25 +1,28 @@
--TEST--
mysqli bind_param/bind_prepare fetch long values
--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);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
- mysqli_select_db($link, "test");
+ mysqli_select_db($link, $db);
mysqli_query($link, "SET sql_mode=''");
- mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
- mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 int unsigned,
- c2 int unsigned,
- c3 int,
- c4 int,
- c5 int,
- c6 int unsigned,
- c7 int)");
+ mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
+ mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 int unsigned,
+ c2 int unsigned,
+ c3 int,
+ c4 int,
+ c5 int,
+ c6 int unsigned,
+ c7 int)");
$stmt = mysqli_prepare($link, "INSERT INTO test_bind_fetch VALUES
(?,?,?,?,?,?,?)");
mysqli_bind_param($stmt, "iiiiiii", $c1,$c2,$c3,$c4,$c5,$c6,$c7);
@@ -45,6 +48,8 @@
mysqli_stmt_close($stmt);
mysqli_close($link);
+
+ print "done!";
?>
--EXPECT--
array(7) {
@@ -63,3 +68,4 @@
[6]=>
int(0)
}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/024.phpt?r1=1.5.2.1&r2=1.5.2.1.4.1&diff_format=u
Index: php-src/ext/mysqli/tests/024.phpt
diff -u php-src/ext/mysqli/tests/024.phpt:1.5.2.1
php-src/ext/mysqli/tests/024.phpt:1.5.2.1.4.1
--- php-src/ext/mysqli/tests/024.phpt:1.5.2.1 Sat Oct 8 15:08:07 2005
+++ php-src/ext/mysqli/tests/024.phpt Wed Oct 10 10:07:46 2007
@@ -1,25 +1,28 @@
--TEST--
mysqli bind_param/bind_result short values
--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);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
- mysqli_select_db($link, "test");
+ mysqli_select_db($link, $db);
mysqli_query($link, "SET sql_mode=''");
- mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
- mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 smallint unsigned,
- c2 smallint unsigned,
- c3 smallint,
- c4 smallint,
- c5 smallint,
- c6 smallint unsigned,
- c7 smallint)");
+ mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
+ mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 smallint unsigned,
+ c2 smallint unsigned,
+ c3 smallint,
+ c4 smallint,
+ c5 smallint,
+ c6 smallint unsigned,
+ c7 smallint)");
$stmt = mysqli_prepare($link, "INSERT INTO test_bind_fetch VALUES
(?,?,?,?,?,?,?)");
mysqli_bind_param($stmt, "iiiiiii", $c1,$c2,$c3,$c4,$c5,$c6,$c7);
@@ -46,6 +49,7 @@
mysqli_stmt_close($stmt);
mysqli_close($link);
+ print "done!";
?>
--EXPECT--
array(7) {
@@ -64,3 +68,4 @@
[6]=>
int(0)
}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/025.phpt?r1=1.5.2.1&r2=1.5.2.1.4.1&diff_format=u
Index: php-src/ext/mysqli/tests/025.phpt
diff -u php-src/ext/mysqli/tests/025.phpt:1.5.2.1
php-src/ext/mysqli/tests/025.phpt:1.5.2.1.4.1
--- php-src/ext/mysqli/tests/025.phpt:1.5.2.1 Sat Oct 8 15:08:07 2005
+++ php-src/ext/mysqli/tests/025.phpt Wed Oct 10 10:07:46 2007
@@ -1,25 +1,28 @@
--TEST--
mysqli bind_param/bind_result tinyint values
--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);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
- mysqli_select_db($link, "test");
+ mysqli_select_db($link, $db);
mysqli_query($link, "SET sql_mode=''");
- mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
- mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 tinyint,
- c2 tinyint unsigned,
- c3 tinyint not NULL,
- c4 tinyint,
- c5 tinyint,
- c6 tinyint unsigned,
- c7 tinyint)");
+ mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
+ mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 tinyint,
+ c2 tinyint unsigned,
+ c3 tinyint not NULL,
+ c4 tinyint,
+ c5 tinyint,
+ c6 tinyint unsigned,
+ c7 tinyint)");
$stmt = mysqli_prepare ($link, "INSERT INTO test_bind_fetch
VALUES(?,?,?,?,?,?,?)");
mysqli_bind_param($stmt, "iiiiiii", $c1,$c2,$c3,$c4,$c5,$c6,$c7);
@@ -50,6 +53,8 @@
mysqli_stmt_close($stmt);
mysqli_close($link);
+
+ print "done!";
?>
--EXPECT--
array(7) {
@@ -68,3 +73,4 @@
[6]=>
int(0)
}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/026.phpt?r1=1.6.2.1&r2=1.6.2.1.4.1&diff_format=u
Index: php-src/ext/mysqli/tests/026.phpt
diff -u php-src/ext/mysqli/tests/026.phpt:1.6.2.1
php-src/ext/mysqli/tests/026.phpt:1.6.2.1.4.1
--- php-src/ext/mysqli/tests/026.phpt:1.6.2.1 Sat Oct 8 15:08:07 2005
+++ php-src/ext/mysqli/tests/026.phpt Wed Oct 10 10:07:46 2007
@@ -1,19 +1,22 @@
--TEST--
-mysqli bind_param/bind_result with send_long_data
+mysqli bind_param/bind_result with send_long_data
--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);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
- mysqli_select_db($link, "test");
+ mysqli_select_db($link, $db);
mysqli_query($link, "SET sql_mode=''");
- mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
- mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 varchar(10), c2
text)");
+ mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
+ mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 varchar(10), c2
text)");
$stmt = mysqli_prepare ($link, "INSERT INTO test_bind_fetch VALUES
(?,?)");
mysqli_bind_param($stmt, "sb", $c1, $c2);
@@ -39,11 +42,20 @@
mysqli_stmt_close($stmt);
mysqli_close($link);
-?>
---EXPECT--
+ print "done!";
+--EXPECTF--
array(2) {
[0]=>
string(10) "Hello Worl"
[1]=>
string(99) "This is the first sentence. And this is the second sentence. And
finally this is the last sentence."
}
+done!
+--UEXPECTF--
+array(2) {
+ [0]=>
+ unicode(10) "Hello Worl"
+ [1]=>
+ %s(99) "This is the first sentence. And this is the second sentence. And
finally this is the last sentence."
+}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/027.phpt?r1=1.4&r2=1.4.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/027.phpt
diff -u php-src/ext/mysqli/tests/027.phpt:1.4
php-src/ext/mysqli/tests/027.phpt:1.4.6.1
--- php-src/ext/mysqli/tests/027.phpt:1.4 Sat Dec 4 08:50:33 2004
+++ php-src/ext/mysqli/tests/027.phpt Wed Oct 10 10:07:46 2007
@@ -1,20 +1,24 @@
--TEST--
function test: mysqli_stat
--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);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
$status = mysqli_stat($link);
-
var_dump(strlen($status) > 0);
mysqli_close($link);
+ print "done!";
?>
--EXPECT--
bool(true)
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/028.phpt?r1=1.4.4.1&r2=1.4.4.1.2.1&diff_format=u
Index: php-src/ext/mysqli/tests/028.phpt
diff -u php-src/ext/mysqli/tests/028.phpt:1.4.4.1
php-src/ext/mysqli/tests/028.phpt:1.4.4.1.2.1
--- php-src/ext/mysqli/tests/028.phpt:1.4.4.1 Thu Aug 10 13:43:18 2006
+++ php-src/ext/mysqli/tests/028.phpt Wed Oct 10 10:07:46 2007
@@ -1,19 +1,27 @@
--TEST--
function test: mysqli_character_set_name
--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);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
$cset = substr(mysqli_character_set_name($link),0,6);
var_dump($cset);
mysqli_close($link);
+ print "done!";
?>
--EXPECTF--
string(%d) "%s"
+done!
+--UEXPECTF--
+unicode(%d) "%s"
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/029.phpt?r1=1.3&r2=1.3.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/029.phpt
diff -u php-src/ext/mysqli/tests/029.phpt:1.3
php-src/ext/mysqli/tests/029.phpt:1.3.6.1
--- php-src/ext/mysqli/tests/029.phpt:1.3 Sat Dec 4 08:50:33 2004
+++ php-src/ext/mysqli/tests/029.phpt Wed Oct 10 10:07:46 2007
@@ -1,15 +1,18 @@
--TEST--
function test: mysqli_affected_rows
--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);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
- mysqli_select_db($link, "test");
+ mysqli_select_db($link, $db);
mysqli_query($link, "drop table if exists general_test");
mysqli_query($link, "create table general_test (a int)");
@@ -20,6 +23,8 @@
var_dump($afc);
mysqli_close($link);
+ print "done!";
?>
--EXPECT--
int(3)
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/030.phpt?r1=1.3&r2=1.3.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/030.phpt
diff -u php-src/ext/mysqli/tests/030.phpt:1.3
php-src/ext/mysqli/tests/030.phpt:1.3.6.1
--- php-src/ext/mysqli/tests/030.phpt:1.3 Sat Dec 4 08:50:33 2004
+++ php-src/ext/mysqli/tests/030.phpt Wed Oct 10 10:07:46 2007
@@ -1,25 +1,30 @@
--TEST--
function test: mysqli_errno
--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);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
$errno = mysqli_errno($link);
var_dump($errno);
mysqli_select_db($link, "test");
mysqli_query($link, "select * from non_exisiting_table");
- $errno = mysqli_errno($link);
+ $errno = mysqli_errno($link);
var_dump($errno);
mysqli_close($link);
+ print "done!";
?>
--EXPECT--
int(0)
int(1146)
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/031.phpt?r1=1.3&r2=1.3.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/031.phpt
diff -u php-src/ext/mysqli/tests/031.phpt:1.3
php-src/ext/mysqli/tests/031.phpt:1.3.6.1
--- php-src/ext/mysqli/tests/031.phpt:1.3 Sat Dec 4 08:50:33 2004
+++ php-src/ext/mysqli/tests/031.phpt Wed Oct 10 10:07:46 2007
@@ -1,25 +1,34 @@
--TEST--
function test: mysqli_error
--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);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
$error = mysqli_error($link);
var_dump($error);
- mysqli_select_db($link, "test");
+ mysqli_select_db($link, $db);
mysqli_query($link, "select * from non_exisiting_table");
- $error = mysqli_error($link);
+ $error = mysqli_error($link);
var_dump($error);
mysqli_close($link);
+ print "done!";
?>
---EXPECT--
+--EXPECTF--
string(0) ""
-string(46) "Table 'test.non_exisiting_table' doesn't exist"
+string(%d) "%s"
+done!
+--UEXPECTF--
+unicode(0) ""
+unicode(%d) "%s"
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/032.phpt?r1=1.3&r2=1.3.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/032.phpt
diff -u php-src/ext/mysqli/tests/032.phpt:1.3
php-src/ext/mysqli/tests/032.phpt:1.3.6.1
--- php-src/ext/mysqli/tests/032.phpt:1.3 Sat Dec 4 08:50:33 2004
+++ php-src/ext/mysqli/tests/032.phpt Wed Oct 10 10:07:46 2007
@@ -1,15 +1,18 @@
--TEST--
function test: mysqli_info
--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);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
- mysqli_select_db($link, "test");
+ mysqli_select_db($link, $db);
mysqli_query($link, "drop table if exists general_test");
mysqli_query($link, "create table general_test (a int)");
@@ -20,6 +23,11 @@
var_dump($afc);
mysqli_close($link);
+ print "done!";
?>
---EXPECT--
+--EXPECTF--
string(38) "Records: 3 Duplicates: 0 Warnings: 0"
+done!
+--UEXPECTF--
+unicode(38) "Records: 3 Duplicates: 0 Warnings: 0"
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/033.phpt?r1=1.5&r2=1.5.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/033.phpt
diff -u php-src/ext/mysqli/tests/033.phpt:1.5
php-src/ext/mysqli/tests/033.phpt:1.5.6.1
--- php-src/ext/mysqli/tests/033.phpt:1.5 Tue Apr 19 15:45:07 2005
+++ php-src/ext/mysqli/tests/033.phpt Wed Oct 10 10:07:46 2007
@@ -1,20 +1,28 @@
--TEST--
function test: mysqli_get_host_info
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
-
+
/*** test mysqli_connect 127.0.0.1 ***/
- $link = mysqli_connect($host, $user, $passwd);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
$hinfo = mysqli_get_host_info($link);
var_dump(str_replace('/','', $hinfo));
mysqli_close($link);
+ print "done!";
?>
--EXPECTF--
string(%d) "%s via %s"
+done!
+--UEXPECTF--
+unicode(%d) "%s via %s"
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/034.phpt?r1=1.4&r2=1.4.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/034.phpt
diff -u php-src/ext/mysqli/tests/034.phpt:1.4
php-src/ext/mysqli/tests/034.phpt:1.4.6.1
--- php-src/ext/mysqli/tests/034.phpt:1.4 Fri Jan 7 14:59:59 2005
+++ php-src/ext/mysqli/tests/034.phpt Wed Oct 10 10:07:46 2007
@@ -1,20 +1,25 @@
--TEST--
function test: mysqli_get_proto_info
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
-
+
/*** test mysqli_connect 127.0.0.1 ***/
- $link = mysqli_connect($host, $user, $passwd);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
$pinfo = mysqli_get_proto_info($link);
var_dump($pinfo);
mysqli_close($link);
+ print "done!";
?>
--EXPECT--
int(10)
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/035.phpt?r1=1.4&r2=1.4.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/035.phpt
diff -u php-src/ext/mysqli/tests/035.phpt:1.4
php-src/ext/mysqli/tests/035.phpt:1.4.6.1
--- php-src/ext/mysqli/tests/035.phpt:1.4 Sat Dec 4 08:50:33 2004
+++ php-src/ext/mysqli/tests/035.phpt Wed Oct 10 10:07:46 2007
@@ -1,19 +1,24 @@
--TEST--
function test: mysqli_get_server_info
--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);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
$sinfo = substr(mysqli_get_server_info($link),0,1);
var_dump(strlen($sinfo));
mysqli_close($link);
+ print "done!";
?>
--EXPECT--
int(1)
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/036.phpt?r1=1.4&r2=1.4.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/036.phpt
diff -u php-src/ext/mysqli/tests/036.phpt:1.4
php-src/ext/mysqli/tests/036.phpt:1.4.6.1
--- php-src/ext/mysqli/tests/036.phpt:1.4 Wed Jul 20 00:18:24 2005
+++ php-src/ext/mysqli/tests/036.phpt Wed Oct 10 10:07:46 2007
@@ -1,22 +1,23 @@
--TEST--
function test: mysqli_insert_id()
--SKIPIF--
-<?php
+<?php
if (PHP_INT_SIZE == 8) {
echo 'skip test valid only for 32bit systems';
exit;
}
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);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
- mysqli_select_db($link, "test");
+ mysqli_select_db($link, $db);
mysqli_query($link, "DROP TABLE IF EXISTS t036");
@@ -28,19 +29,20 @@
/* we have to insert more values, cause lexer sets auto_increment to
max_int
see mysql bug #54. So we don't check for the value, only for type
(which must
- be type string)
- */
-
+ be type string)
+ */
+
mysqli_query($link, "ALTER TABLE t036 AUTO_INCREMENT=9999999999999998");
mysqli_query($link, "INSERT INTO t036 (b) VALUES ('foo2')");
mysqli_query($link, "INSERT INTO t036 (b) VALUES ('foo3')");
mysqli_query($link, "INSERT INTO t036 (b) VALUES ('foo4')");
$x = mysqli_insert_id($link);
$test[] = is_string($x);
-
+
var_dump($test);
mysqli_close($link);
+ print "done!";
?>
--EXPECT--
array(2) {
@@ -49,3 +51,4 @@
[1]=>
bool(true)
}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/037.phpt?r1=1.3&r2=1.3.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/037.phpt
diff -u php-src/ext/mysqli/tests/037.phpt:1.3
php-src/ext/mysqli/tests/037.phpt:1.3.6.1
--- php-src/ext/mysqli/tests/037.phpt:1.3 Sat Dec 4 08:50:33 2004
+++ php-src/ext/mysqli/tests/037.phpt Wed Oct 10 10:07:46 2007
@@ -1,16 +1,19 @@
--TEST--
function test: mysqli_field_count()
--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);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
- mysqli_select_db($link, "test");
+ mysqli_select_db($link, $db);
mysqli_query($link, "DROP TABLE IF EXISTS test_result");
@@ -21,11 +24,12 @@
mysqli_real_query($link, "SELECT * FROM test_result");
$ir[] = mysqli_field_count($link);
-
-
+
+
var_dump($ir);
mysqli_close($link);
+ print "done!";
?>
--EXPECT--
array(2) {
@@ -34,3 +38,4 @@
[1]=>
int(2)
}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/038.phpt?r1=1.3&r2=1.3.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/038.phpt
diff -u php-src/ext/mysqli/tests/038.phpt:1.3
php-src/ext/mysqli/tests/038.phpt:1.3.6.1
--- php-src/ext/mysqli/tests/038.phpt:1.3 Sat Dec 4 08:50:33 2004
+++ php-src/ext/mysqli/tests/038.phpt Wed Oct 10 10:07:46 2007
@@ -1,16 +1,19 @@
--TEST--
function test: mysqli_num_fields()
--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);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
- mysqli_select_db($link, "test");
+ mysqli_select_db($link, $db);
mysqli_query($link, "DROP TABLE IF EXISTS test_result");
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/039.phpt?r1=1.3&r2=1.3.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/039.phpt
diff -u php-src/ext/mysqli/tests/039.phpt:1.3
php-src/ext/mysqli/tests/039.phpt:1.3.6.1
--- php-src/ext/mysqli/tests/039.phpt:1.3 Sat Dec 4 08:50:33 2004
+++ php-src/ext/mysqli/tests/039.phpt Wed Oct 10 10:07:46 2007
@@ -1,14 +1,17 @@
--TEST--
function test: mysqli_num_fields() 2
--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);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
mysqli_real_query($link, "SHOW VARIABLES");
@@ -21,6 +24,8 @@
var_dump($num);
mysqli_close($link);
+ print "done!";
?>
--EXPECT--
int(2)
+done!
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
