tony2001 Tue Mar 28 09:12:45 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/oci8/tests cursors.phpt debug.phpt error1.phpt
exec_fetch.phpt fetch_array.phpt
fetch_assoc.phpt fetch_object.phpt
fetch_row.phpt field_funcs_old.phpt
field_funcs.phpt
Log:
fix tests
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/tests/cursors.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/oci8/tests/cursors.phpt
diff -u php-src/ext/oci8/tests/cursors.phpt:1.1.2.3
php-src/ext/oci8/tests/cursors.phpt:1.1.2.4
--- php-src/ext/oci8/tests/cursors.phpt:1.1.2.3 Tue Dec 6 19:28:24 2005
+++ php-src/ext/oci8/tests/cursors.phpt Tue Mar 28 09:12:45 2006
@@ -45,15 +45,21 @@
?>
--EXPECTF--
-array(2) {
+array(5) {
["ID"]=>
string(1) "1"
["VALUE"]=>
string(1) "1"
+ ["BLOB"]=>
+ NULL
+ ["CLOB"]=>
+ NULL
+ ["STRING"]=>
+ NULL
}
bool(true)
-Warning: oci_fetch_assoc()%sORA-01002: fetch out of sequence in %scursors.php
on line %d
+Warning: oci_fetch_assoc(): ORA-01002: fetch out of sequence in %s on line %d
bool(false)
bool(true)
Done
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/tests/debug.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/oci8/tests/debug.phpt
diff -u php-src/ext/oci8/tests/debug.phpt:1.1.2.3
php-src/ext/oci8/tests/debug.phpt:1.1.2.4
--- php-src/ext/oci8/tests/debug.phpt:1.1.2.3 Tue Dec 6 19:28:24 2005
+++ php-src/ext/oci8/tests/debug.phpt Tue Mar 28 09:12:45 2006
@@ -20,12 +20,14 @@
?>
--EXPECTF--
-OCI8 DEBUG: OCINlsEnvironmentVariableGet in php_oci_do_connect_ex()
(%s/oci8.c:%d)
+OCI8 DEBUG: OCINlsEnvironmentVariableGet at (%s:%d)
Done
-OCI8 DEBUG: OCISessionEnd in php_oci_connection_close() (%s/oci8.c:%d)
-OCI8 DEBUG: OCIHandleFree in php_oci_connection_close() (%s/oci8.c:%d)
-OCI8 DEBUG: OCIServerDetach in php_oci_connection_close() (%s/oci8.c:%d)
-OCI8 DEBUG: OCIHandleFree in php_oci_connection_close() (%s/oci8.c:%d)
-OCI8 DEBUG: OCIHandleFree in php_oci_connection_close() (%s/oci8.c:%d)
-OCI8 DEBUG: OCIHandleFree in php_oci_connection_close() (%s/oci8.c:%d)
-OCI8 DEBUG: OCIHandleFree in php_oci_connection_close() (%s/oci8.c:%d)
+OCI8 DEBUG: OCISessionEnd at (%s:%d)
+OCI8 DEBUG: OCIHandleFree at (%s:%d)
+OCI8 DEBUG: OCIServerDetach at (%s:%d)
+OCI8 DEBUG: OCIHandleFree at (%s:%d)
+OCI8 DEBUG: OCIHandleFree at (%s:%d)
+OCI8 DEBUG: OCIHandleFree at (%s:%d)
+OCI8 DEBUG: OCIHandleFree at (%s:%d)
+OCI8 DEBUG: OCIHandleFree at (%s:%d)
+OCI8 DEBUG: OCIHandleFree at (%s:%d)
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/tests/error1.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/oci8/tests/error1.phpt
diff -u php-src/ext/oci8/tests/error1.phpt:1.1.2.3
php-src/ext/oci8/tests/error1.phpt:1.1.2.4
--- php-src/ext/oci8/tests/error1.phpt:1.1.2.3 Tue Dec 6 19:28:24 2005
+++ php-src/ext/oci8/tests/error1.phpt Tue Mar 28 09:12:45 2006
@@ -12,7 +12,16 @@
?>
--EXPECTF--
-Warning: oci_connect(): ORA-12154: TNS:could not resolve the connect
identifier specified in %s on line %d
-bool(false)
+Warning: oci_connect(): ORA-12154: TNS:could not resolve service name in %s on
line %d
bool(false)
+array(4) {
+ ["code"]=>
+ int(12154)
+ ["message"]=>
+ string(45) "ORA-12154: TNS:could not resolve service name"
+ ["offset"]=>
+ int(0)
+ ["sqltext"]=>
+ string(0) ""
+}
Done
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/tests/exec_fetch.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/oci8/tests/exec_fetch.phpt
diff -u php-src/ext/oci8/tests/exec_fetch.phpt:1.1.2.3
php-src/ext/oci8/tests/exec_fetch.phpt:1.1.2.4
--- php-src/ext/oci8/tests/exec_fetch.phpt:1.1.2.3 Tue Dec 6 19:28:25 2005
+++ php-src/ext/oci8/tests/exec_fetch.phpt Tue Mar 28 09:12:45 2006
@@ -16,4 +16,9 @@
echo "Done\n";
?>
--EXPECTF--
+Warning: oci_execute(): ORA-00942: table or view does not exist in %s on line
%d
+bool(false)
+
+Warning: oci_fetch_array(): ORA-24374: define not done before fetch or execute
and fetch in %s on line %d
+bool(false)
Done
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/tests/fetch_array.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/oci8/tests/fetch_array.phpt
diff -u php-src/ext/oci8/tests/fetch_array.phpt:1.1.2.3
php-src/ext/oci8/tests/fetch_array.phpt:1.1.2.4
--- php-src/ext/oci8/tests/fetch_array.phpt:1.1.2.3 Tue Dec 6 19:28:25 2005
+++ php-src/ext/oci8/tests/fetch_array.phpt Tue Mar 28 09:12:45 2006
@@ -77,7 +77,7 @@
echo "Done\n";
?>
--EXPECT--
-array(4) {
+array(10) {
[0]=>
string(1) "1"
["ID"]=>
@@ -86,8 +86,20 @@
string(1) "1"
["VALUE"]=>
string(1) "1"
+ [2]=>
+ NULL
+ ["BLOB"]=>
+ NULL
+ [3]=>
+ NULL
+ ["CLOB"]=>
+ NULL
+ [4]=>
+ NULL
+ ["STRING"]=>
+ NULL
}
-array(4) {
+array(10) {
[0]=>
string(1) "1"
["ID"]=>
@@ -96,8 +108,20 @@
string(1) "1"
["VALUE"]=>
string(1) "1"
+ [2]=>
+ NULL
+ ["BLOB"]=>
+ NULL
+ [3]=>
+ NULL
+ ["CLOB"]=>
+ NULL
+ [4]=>
+ NULL
+ ["STRING"]=>
+ NULL
}
-array(4) {
+array(10) {
[0]=>
string(1) "1"
["ID"]=>
@@ -106,6 +130,18 @@
string(1) "1"
["VALUE"]=>
string(1) "1"
+ [2]=>
+ NULL
+ ["BLOB"]=>
+ NULL
+ [3]=>
+ NULL
+ ["CLOB"]=>
+ NULL
+ [4]=>
+ NULL
+ ["STRING"]=>
+ NULL
}
array(2) {
[0]=>
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/tests/fetch_assoc.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/oci8/tests/fetch_assoc.phpt
diff -u php-src/ext/oci8/tests/fetch_assoc.phpt:1.1.2.3
php-src/ext/oci8/tests/fetch_assoc.phpt:1.1.2.4
--- php-src/ext/oci8/tests/fetch_assoc.phpt:1.1.2.3 Tue Dec 6 19:28:25 2005
+++ php-src/ext/oci8/tests/fetch_assoc.phpt Tue Mar 28 09:12:45 2006
@@ -43,22 +43,40 @@
?>
--EXPECT--
-array(2) {
+array(5) {
["ID"]=>
string(1) "1"
["VALUE"]=>
string(1) "1"
+ ["BLOB"]=>
+ NULL
+ ["CLOB"]=>
+ NULL
+ ["STRING"]=>
+ NULL
}
-array(2) {
+array(5) {
["ID"]=>
string(1) "1"
["VALUE"]=>
string(1) "1"
+ ["BLOB"]=>
+ NULL
+ ["CLOB"]=>
+ NULL
+ ["STRING"]=>
+ NULL
}
-array(2) {
+array(5) {
["ID"]=>
string(1) "1"
["VALUE"]=>
string(1) "1"
+ ["BLOB"]=>
+ NULL
+ ["CLOB"]=>
+ NULL
+ ["STRING"]=>
+ NULL
}
Done
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/tests/fetch_object.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/oci8/tests/fetch_object.phpt
diff -u php-src/ext/oci8/tests/fetch_object.phpt:1.1.2.3
php-src/ext/oci8/tests/fetch_object.phpt:1.1.2.4
--- php-src/ext/oci8/tests/fetch_object.phpt:1.1.2.3 Tue Dec 6 19:28:25 2005
+++ php-src/ext/oci8/tests/fetch_object.phpt Tue Mar 28 09:12:45 2006
@@ -42,23 +42,41 @@
echo "Done\n";
?>
---EXPECT--
-object(stdClass)#1 (2) {
+--EXPECTF--
+object(stdClass)#%d (5) {
["ID"]=>
string(1) "1"
["VALUE"]=>
string(1) "1"
+ ["BLOB"]=>
+ NULL
+ ["CLOB"]=>
+ NULL
+ ["STRING"]=>
+ NULL
}
-object(stdClass)#2 (2) {
+object(stdClass)#%d (5) {
["ID"]=>
string(1) "1"
["VALUE"]=>
string(1) "1"
+ ["BLOB"]=>
+ NULL
+ ["CLOB"]=>
+ NULL
+ ["STRING"]=>
+ NULL
}
-object(stdClass)#1 (2) {
+object(stdClass)#%d (5) {
["ID"]=>
string(1) "1"
["VALUE"]=>
string(1) "1"
+ ["BLOB"]=>
+ NULL
+ ["CLOB"]=>
+ NULL
+ ["STRING"]=>
+ NULL
}
Done
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/tests/fetch_row.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/oci8/tests/fetch_row.phpt
diff -u php-src/ext/oci8/tests/fetch_row.phpt:1.1.2.3
php-src/ext/oci8/tests/fetch_row.phpt:1.1.2.4
--- php-src/ext/oci8/tests/fetch_row.phpt:1.1.2.3 Tue Dec 6 19:28:25 2005
+++ php-src/ext/oci8/tests/fetch_row.phpt Tue Mar 28 09:12:45 2006
@@ -43,22 +43,40 @@
?>
--EXPECT--
-array(2) {
+array(5) {
[0]=>
string(1) "1"
[1]=>
string(1) "1"
+ [2]=>
+ NULL
+ [3]=>
+ NULL
+ [4]=>
+ NULL
}
-array(2) {
+array(5) {
[0]=>
string(1) "1"
[1]=>
string(1) "1"
+ [2]=>
+ NULL
+ [3]=>
+ NULL
+ [4]=>
+ NULL
}
-array(2) {
+array(5) {
[0]=>
string(1) "1"
[1]=>
string(1) "1"
+ [2]=>
+ NULL
+ [3]=>
+ NULL
+ [4]=>
+ NULL
}
Done
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/tests/field_funcs_old.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/oci8/tests/field_funcs_old.phpt
diff -u php-src/ext/oci8/tests/field_funcs_old.phpt:1.1.2.3
php-src/ext/oci8/tests/field_funcs_old.phpt:1.1.2.4
--- php-src/ext/oci8/tests/field_funcs_old.phpt:1.1.2.3 Tue Dec 6 19:28:25 2005
+++ php-src/ext/oci8/tests/field_funcs_old.phpt Tue Mar 28 09:12:45 2006
@@ -97,7 +97,7 @@
int(4000)
bool(true)
string(6) "STRING"
-string(7) "VARCHAR"
+string(8) "VARCHAR2"
int(1)
int(0)
int(0)
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/tests/field_funcs.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/oci8/tests/field_funcs.phpt
diff -u php-src/ext/oci8/tests/field_funcs.phpt:1.1.2.3
php-src/ext/oci8/tests/field_funcs.phpt:1.1.2.4
--- php-src/ext/oci8/tests/field_funcs.phpt:1.1.2.3 Tue Dec 6 19:28:25 2005
+++ php-src/ext/oci8/tests/field_funcs.phpt Tue Mar 28 09:12:45 2006
@@ -97,7 +97,7 @@
int(4000)
bool(true)
string(6) "STRING"
-string(7) "VARCHAR"
+string(8) "VARCHAR2"
int(1)
int(0)
int(0)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
