Imported Upstream version 5.0.4upstream/5.0.4

5 files changed, 185 insertions, 0 deletions

diff --git a/ext/mysql/tests/001.phpt b/ext/mysql/tests/001.phpt
new file mode 100755
index 000000000..5d36462ba
--- /dev/null
+++ b/ext/mysql/tests/001.phpt
@@ -0,0 +1,30 @@
+--TEST--
+mysql connect
+--SKIPIF--
+<?php include 'skipif.inc'; ?>
+--FILE--
+<?php
+
+include 'connect.inc';
+$test = '';
+
+/*** test mysql_connect 127.0.0.1 ***/
+$db = mysql_connect('127.0.0.1', $user, $passwd);
+$test .= ($db) ? '1' : '0';
+mysql_close($db);
+
+/*** test mysql_connect localhost ***/
+$db = mysql_connect($host, $user, $passwd);
+$test .= ($db) ? '1' : '0';
+mysql_close($db);
+
+/*** test mysql_connect localhost:port ***/
+$db = mysql_connect($host, $user, $passwd, '', 3306);
+$test .= ($db) ? '1' : '0';
+mysql_close($db);
+
+var_dump($test);
+
+?>
+--EXPECT--
+string(3) "111"
diff --git a/ext/mysql/tests/002.phpt b/ext/mysql/tests/002.phpt
new file mode 100755
index 000000000..64da4fa0d
--- /dev/null
+++ b/ext/mysql/tests/002.phpt
@@ -0,0 +1,53 @@
+--TEST--
+mysql_fetch_array
+--SKIPIF--
+<?php include 'skipif.inc'; ?>
+--FILE--
+<?php
+
+include 'connect.inc';
+
+$db = mysql_connect($host, $user, $passwd);
+
+var_dump($db);
+
+var_dump(mysql_select_db('test'));
+
+var_dump(mysql_query('DROP TABLE IF EXISTS test'));
+
+var_dump(mysql_query('CREATE TABLE test(col1 int PRIMARY KEY, col2 varchar(50), col3 char(5))'));
+
+var_dump(mysql_query("INSERT INTO test(col1, col2, col3) VALUES(1, 'foo', 'bar'),(2, 'foo', 'bar')"));
+
+var_dump($res = mysql_query('SELECT col1, col2, col3 FROM test ORDER BY col1 ASC'));
+
+while ($data = mysql_fetch_array($res, MYSQL_ASSOC)) {
+	var_dump($data);
+}
+
+mysql_close($db);
+
+?>
+--EXPECTF--
+resource(%d) of type (mysql link)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+resource(%d) of type (mysql result)
+array(3) {
+  ["col1"]=>
+  string(1) "1"
+  ["col2"]=>
+  string(3) "foo"
+  ["col3"]=>
+  string(3) "bar"
+}
+array(3) {
+  ["col1"]=>
+  string(1) "2"
+  ["col2"]=>
+  string(3) "foo"
+  ["col3"]=>
+  string(3) "bar"
+}
diff --git a/ext/mysql/tests/003.phpt b/ext/mysql/tests/003.phpt
new file mode 100755
index 000000000..81a63f3fc
--- /dev/null
+++ b/ext/mysql/tests/003.phpt
@@ -0,0 +1,84 @@
+--TEST--
+mysql_fetch_object
+--SKIPIF--
+<?php include 'skipif.inc'; ?>
+--FILE--
+<?php
+
+include 'connect.inc';
+
+class class24 {
+	function __construct() {
+		echo __METHOD__ . "\n";
+	}
+}
+
+$data = array(
+	"one",
+	"two",
+	"three"
+	);
+
+$db = mysql_connect($host, $user, $passwd);
+
+mysql_select_db("test");
+
+mysql_query('DROP TABLE IF EXISTS test');
+
+mysql_query("CREATE TABLE test(a varchar(10))");
+
+foreach ($data as $str) {
+	mysql_query("INSERT INTO test VALUES('$str')");
+	var_dump($str);
+}
+
+echo "==stdClass==\n";
+$res = mysql_query("SELECT a FROM test");
+while ($obj = mysql_fetch_object($res)) {
+	var_dump($obj);
+}
+
+echo "==class24==\n";
+$res = mysql_query("SELECT a FROM test");
+while ($obj = mysql_fetch_object($res, 'class24')) {
+	var_dump($obj);
+}
+
+mysql_close($db);
+
+?>
+==DONE==
+--EXPECTF--
+string(3) "one"
+string(3) "two"
+string(5) "three"
+==stdClass==
+object(stdClass)#%d (1) {
+  ["a"]=>
+  string(3) "one"
+}
+object(stdClass)#%d (1) {
+  ["a"]=>
+  string(3) "two"
+}
+object(stdClass)#%d (1) {
+  ["a"]=>
+  string(5) "three"
+}
+==class24==
+class24::__construct
+object(class24)#%d (1) {
+  ["a"]=>
+  string(3) "one"
+}
+class24::__construct
+object(class24)#%d (1) {
+  ["a"]=>
+  string(3) "two"
+}
+class24::__construct
+object(class24)#%d (1) {
+  ["a"]=>
+  string(5) "three"
+}
+==DONE==
diff --git a/ext/mysql/tests/connect.inc b/ext/mysql/tests/connect.inc
new file mode 100755
index 000000000..aa1d30a17
--- /dev/null
+++ b/ext/mysql/tests/connect.inc
@@ -0,0 +1,10 @@
+<?php
+
+  /* default values are localhost, root and empty password 
+     Change the values if you use another configuration   */
+
+	$host = "localhost";
+	$user = "root";
+	$passwd = "";
+
+?>
diff --git a/ext/mysql/tests/skipif.inc b/ext/mysql/tests/skipif.inc
new file mode 100755
index 000000000..934420b09
--- /dev/null
+++ b/ext/mysql/tests/skipif.inc
@@ -0,0 +1,8 @@
+<?php
+
+include 'connect.inc';
+$link = @mysql_connect($host, $user, $passwd);
+if (!$link) die('skip cannot connect');
+mysql_close($link);
+
+?>
\ No newline at end of file