tony2001Wed Dec 27 09:48:05 2006 UTC
Added files:
/php-src/ext/oci8/tests function_aliases.phpt lob_aliases.phpt
Modified files:
/php-src/ext/oci8/tests details.inc num.phpt statement_type.phpt
statement_type_old.phpt
Log:
more test improvements by Chris Jones
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/details.inc?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/oci8/tests/details.inc
diff -u php-src/ext/oci8/tests/details.inc:1.1
php-src/ext/oci8/tests/details.inc:1.2
--- php-src/ext/oci8/tests/details.inc:1.1 Tue Dec 12 12:57:02 2006
+++ php-src/ext/oci8/tests/details.inc Wed Dec 27 09:48:05 2006
@@ -7,7 +7,7 @@
$user = system;
$password = system;
-$dbase = oracle;
+$dbase = HP;
/* Set this variable to TRUE if Oracle is installed @ localhost */
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/num.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/oci8/tests/num.phpt
diff -u php-src/ext/oci8/tests/num.phpt:1.3 php-src/ext/oci8/tests/num.phpt:1.4
--- php-src/ext/oci8/tests/num.phpt:1.3 Tue Dec 6 19:26:57 2005
+++ php-src/ext/oci8/tests/num.phpt Wed Dec 27 09:48:05 2006
@@ -8,32 +8,117 @@
require dirname(__FILE__)./connect.inc;
require dirname(__FILE__).'/create_table.inc';
+echo Test 1\n;
+var_dump(ocirowcount());
+var_dump(oci_num_rows());
+var_dump(ocinumcols());
+var_dump(oci_num_fields());
+
$insert_sql = INSERT INTO .$schema.$table_name. (id, value) VALUES (1,1);
if (!($s = oci_parse($c, $insert_sql))) {
- die(oci_parse(insert) failed!\n);
+ die(oci_parse(insert) failed!\n);
}
+echo Test 2\n;
+var_dump(ocirowcount($s));
+var_dump(oci_num_rows($s));
+var_dump(ocinumcols($s));
+var_dump(oci_num_fields($s));
+
for ($i = 0; $i3; $i++) {
- if (!oci_execute($s)) {
- die(oci_execute(insert) failed!\n);
- }
+ if (!oci_execute($s)) {
+die(oci_execute(insert) failed!\n);
+ }
}
+echo Test 3\n;
+var_dump(ocirowcount($s));
+var_dump(oci_num_rows($s));
+var_dump(ocinumcols($s));
+var_dump(oci_num_fields($s));
+
if (!oci_commit($c)) {
- die(oci_commit() failed!\n);
+ die(oci_commit() failed!\n);
}
+echo Test 4\n;
+var_dump(ocirowcount($s));
+var_dump(oci_num_rows($s));
+var_dump(ocinumcols($s));
+var_dump(oci_num_fields($s));
+
+// All rows
$select_sql = SELECT * FROM .$schema.$table_name.;
if (!($s = oci_parse($c, $select_sql))) {
- die(oci_parse(select) failed!\n);
+ die(oci_parse(select) failed!\n);
+}
+
+echo Test 5a\n;
+var_dump(ocirowcount($s));
+var_dump(oci_num_rows($s));
+var_dump(ocinumcols($s));
+var_dump(oci_num_fields($s));
+
+if (!oci_execute($s)) {
+ die(oci_execute(select) failed!\n);
+}
+
+echo Test 5b\n;
+var_dump(ocirowcount($s));
+var_dump(oci_num_rows($s));
+var_dump(ocinumcols($s));
+var_dump(oci_num_fields($s));
+
+
+if (oci_fetch_all($s,$r) === false) {
+ die(oci_fetch_all(select) failed!\n);
+}
+
+echo Test 5c\n;
+var_dump(ocirowcount($s));
+var_dump(oci_num_rows($s));
+var_dump(ocinumcols($s));
+var_dump(oci_num_fields($s));
+
+// One row
+$select_sql = SELECT id, value FROM .$schema.$table_name. WHERE ROWNUM 2;
+
+if (!($s = oci_parse($c, $select_sql))) {
+ die(oci_parse(select) failed!\n);
+}
+
+if (!oci_execute($s)) {
+ die(oci_execute(select) failed!\n);
+}
+
+if (oci_fetch_all($s,$r) === false) {
+ die(oci_fetch_all(select) failed!\n);
+}
+
+echo Test 6\n;
+var_dump(ocirowcount($s));
+var_dump(oci_num_rows($s));
+var_dump(ocinumcols($s));
+var_dump(oci_num_fields($s));
+
+// No rows
+$select_sql = SELECT id FROM .$schema.$table_name. WHERE 1=0;
+
+if (!($s = oci_parse($c, $select_sql))) {
+ die(oci_parse(select) failed!\n);
}
if (!oci_execute($s)) {
- die(oci_execute(select) failed!\n);
+ die(oci_execute(select) failed!\n);
+}
+
+if (oci_fetch_all($s,$r) === false) {
+ die(oci_fetch_all(select) failed!\n);
}
+echo Test 7\n;
var_dump(ocirowcount($s));
var_dump(oci_num_rows($s));
var_dump(ocinumcols($s));
@@ -48,19 +133,89 @@
if (!oci_execute($s)) {
die(oci_execute(delete) failed!\n);
}
+
+echo Test 8a\n;
+var_dump(ocirowcount($s));
+var_dump(oci_num_rows($s));
+var_dump(ocinumcols($s));
+var_dump(oci_num_fields($s));
+
+
oci_commit($c);
+echo Test 8b\n;
+var_dump(ocirowcount($s));
var_dump(oci_num_rows($s));
+var_dump(ocinumcols($s));
+var_dump(oci_num_fields($s));
require dirname(__FILE__).'/drop_table.inc';
echo Done\n;
?
---EXPECT--
+--EXPECTF--
+Test 1
+
+Warning: ocirowcount() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+
+Warning: oci_num_rows() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+
+Warning: ocinumcols() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+
+Warning: oci_num_fields() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+Test 2
+int(0)
int(0)
int(0)
+int(0)
+Test 3
+int(1)
+int(1)
+int(0)
+int(0)
+Test 4
+int(1)
+int(1)
+int(0)
