summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/mysql/tests/mysql_field_name.phpt67
-rw-r--r--ext/mysql/tests/mysql_field_seek.phpt59
-rw-r--r--ext/mysql/tests/mysql_field_table.phpt67
3 files changed, 95 insertions, 98 deletions
diff --git a/ext/mysql/tests/mysql_field_name.phpt b/ext/mysql/tests/mysql_field_name.phpt
index 569176be94..25f8035356 100644
--- a/ext/mysql/tests/mysql_field_name.phpt
+++ b/ext/mysql/tests/mysql_field_name.phpt
@@ -2,42 +2,41 @@
mysql_field_name()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
--FILE--
<?php
- include "connect.inc";
-
- $tmp = NULL;
- $link = NULL;
-
- if (!is_null($tmp = @mysql_field_name()))
- printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-
- if (null !== ($tmp = @mysql_field_name($link)))
- printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-
- require('table.inc');
- if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 2", $link)) {
- printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
- }
-
- if (NULL !== ($tmp = mysql_field_name($res)))
- printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-
- if (false !== ($tmp = mysql_field_name($res, -1)))
- printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
-
- var_dump(mysql_field_name($res, 0));
-
- if (false !== ($tmp = mysql_field_name($res, 2)))
- printf("[008] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
-
- mysql_free_result($res);
-
- var_dump(mysql_field_name($res, 0));
-
- mysql_close($link);
- print "done!";
+include "connect.inc";
+
+$tmp = NULL;
+$link = NULL;
+
+if (!is_null($tmp = @mysql_field_name()))
+ printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (null !== ($tmp = @mysql_field_name($link)))
+ printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 2", $link)) {
+ printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+if (NULL !== ($tmp = mysql_field_name($res)))
+ printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = mysql_field_name($res, -1)))
+ printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+var_dump(mysql_field_name($res, 0));
+
+if (false !== ($tmp = mysql_field_name($res, 2)))
+ printf("[008] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+mysql_free_result($res);
+
+var_dump(mysql_field_name($res, 0));
+
+mysql_close($link);
+print "done!";
?>
--EXPECTF--
Warning: Wrong parameter count for mysql_field_name() in %s on line %d
diff --git a/ext/mysql/tests/mysql_field_seek.phpt b/ext/mysql/tests/mysql_field_seek.phpt
index c5a40dbb90..6a3a647625 100644
--- a/ext/mysql/tests/mysql_field_seek.phpt
+++ b/ext/mysql/tests/mysql_field_seek.phpt
@@ -2,40 +2,39 @@
mysql_field_seek()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
--FILE--
<?php
- include "connect.inc";
+include "connect.inc";
- $tmp = NULL;
- $link = NULL;
-
- if (!is_null($tmp = @mysql_field_seek()))
- printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-
- if (!is_null($tmp = @mysql_field_seek($link)))
- printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+$tmp = NULL;
+$link = NULL;
- require('table.inc');
- if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 1", $link)) {
- printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
- }
-
- var_dump(mysql_field_seek($res, -1));
- var_dump(mysql_fetch_field($res));
- var_dump(mysql_field_seek($res, 0));
- var_dump(mysql_fetch_field($res));
- var_dump(mysql_field_seek($res, 1));
- var_dump(mysql_fetch_field($res));
- var_dump(mysql_field_seek($res, 2));
- var_dump(mysql_fetch_field($res));
-
- mysql_free_result($res);
-
- var_dump(mysql_field_seek($res, 0));
-
- mysql_close($link);
- print "done!";
+if (!is_null($tmp = @mysql_field_seek()))
+ printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!is_null($tmp = @mysql_field_seek($link)))
+ printf("[002] Expecting NULL, 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("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+var_dump(mysql_field_seek($res, -1));
+var_dump(mysql_fetch_field($res));
+var_dump(mysql_field_seek($res, 0));
+var_dump(mysql_fetch_field($res));
+var_dump(mysql_field_seek($res, 1));
+var_dump(mysql_fetch_field($res));
+var_dump(mysql_field_seek($res, 2));
+var_dump(mysql_fetch_field($res));
+
+mysql_free_result($res);
+
+var_dump(mysql_field_seek($res, 0));
+
+mysql_close($link);
+print "done!";
?>
--EXPECTF--
Warning: mysql_field_seek(): Field -1 is invalid for MySQL result index %d in %s on line %d
diff --git a/ext/mysql/tests/mysql_field_table.phpt b/ext/mysql/tests/mysql_field_table.phpt
index 3ee4724d67..dd64b2ca44 100644
--- a/ext/mysql/tests/mysql_field_table.phpt
+++ b/ext/mysql/tests/mysql_field_table.phpt
@@ -2,42 +2,41 @@
mysql_field_table()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
--FILE--
<?php
- include "connect.inc";
-
- $tmp = NULL;
- $link = NULL;
-
- if (!is_null($tmp = @mysql_field_table()))
- printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-
- if (null !== ($tmp = @mysql_field_table($link)))
- printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-
- require('table.inc');
- if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 2", $link)) {
- printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
- }
-
- if (NULL !== ($tmp = mysql_field_table($res)))
- printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-
- if (false !== ($tmp = mysql_field_table($res, -1)))
- printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
-
- var_dump(mysql_field_table($res, 0));
-
- if (false !== ($tmp = mysql_field_table($res, 2)))
- printf("[008] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
-
- mysql_free_result($res);
-
- var_dump(mysql_field_table($res, 0));
-
- mysql_close($link);
- print "done!";
+include "connect.inc";
+
+$tmp = NULL;
+$link = NULL;
+
+if (!is_null($tmp = @mysql_field_table()))
+ printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (null !== ($tmp = @mysql_field_table($link)))
+ printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 2", $link)) {
+ printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+if (NULL !== ($tmp = mysql_field_table($res)))
+ printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = mysql_field_table($res, -1)))
+ printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+var_dump(mysql_field_table($res, 0));
+
+if (false !== ($tmp = mysql_field_table($res, 2)))
+ printf("[008] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+mysql_free_result($res);
+
+var_dump(mysql_field_table($res, 0));
+
+mysql_close($link);
+print "done!";
?>
--EXPECTF--
Warning: Wrong parameter count for mysql_field_table() in %s on line %d