summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/oci8/tests/cursors.phpt10
-rw-r--r--ext/oci8/tests/debug.phpt18
-rw-r--r--ext/oci8/tests/error1.phpt13
-rw-r--r--ext/oci8/tests/exec_fetch.phpt5
-rw-r--r--ext/oci8/tests/fetch_array.phpt42
-rw-r--r--ext/oci8/tests/fetch_assoc.phpt24
-rw-r--r--ext/oci8/tests/fetch_object.phpt26
-rw-r--r--ext/oci8/tests/fetch_row.phpt24
-rw-r--r--ext/oci8/tests/field_funcs.phpt2
-rw-r--r--ext/oci8/tests/field_funcs_old.phpt2
10 files changed, 139 insertions, 27 deletions
diff --git a/ext/oci8/tests/cursors.phpt b/ext/oci8/tests/cursors.phpt
index 6c92a2b91e..22c89c9c54 100644
--- a/ext/oci8/tests/cursors.phpt
+++ b/ext/oci8/tests/cursors.phpt
@@ -45,15 +45,21 @@ echo "Done\n";
?>
--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
diff --git a/ext/oci8/tests/debug.phpt b/ext/oci8/tests/debug.phpt
index a3e3932400..cc771d5319 100644
--- a/ext/oci8/tests/debug.phpt
+++ b/ext/oci8/tests/debug.phpt
@@ -20,12 +20,14 @@ echo "Done\n";
?>
--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)
diff --git a/ext/oci8/tests/error1.phpt b/ext/oci8/tests/error1.phpt
index 28408f9c93..8b358b612a 100644
--- a/ext/oci8/tests/error1.phpt
+++ b/ext/oci8/tests/error1.phpt
@@ -12,7 +12,16 @@ echo "Done\n";
?>
--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
diff --git a/ext/oci8/tests/exec_fetch.phpt b/ext/oci8/tests/exec_fetch.phpt
index 6734f61695..83aae69f7d 100644
--- a/ext/oci8/tests/exec_fetch.phpt
+++ b/ext/oci8/tests/exec_fetch.phpt
@@ -16,4 +16,9 @@ var_dump(oci_fetch_array($stmt));
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
diff --git a/ext/oci8/tests/fetch_array.phpt b/ext/oci8/tests/fetch_array.phpt
index bfffd4e7de..3078295426 100644
--- a/ext/oci8/tests/fetch_array.phpt
+++ b/ext/oci8/tests/fetch_array.phpt
@@ -77,7 +77,7 @@ require dirname(__FILE__).'/drop_table.inc';
echo "Done\n";
?>
--EXPECT--
-array(4) {
+array(10) {
[0]=>
string(1) "1"
["ID"]=>
@@ -86,8 +86,20 @@ array(4) {
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 @@ array(4) {
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 @@ array(4) {
string(1) "1"
["VALUE"]=>
string(1) "1"
+ [2]=>
+ NULL
+ ["BLOB"]=>
+ NULL
+ [3]=>
+ NULL
+ ["CLOB"]=>
+ NULL
+ [4]=>
+ NULL
+ ["STRING"]=>
+ NULL
}
array(2) {
[0]=>
diff --git a/ext/oci8/tests/fetch_assoc.phpt b/ext/oci8/tests/fetch_assoc.phpt
index 2c9590db51..7dacf2e5b2 100644
--- a/ext/oci8/tests/fetch_assoc.phpt
+++ b/ext/oci8/tests/fetch_assoc.phpt
@@ -43,22 +43,40 @@ echo "Done\n";
?>
--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
diff --git a/ext/oci8/tests/fetch_object.phpt b/ext/oci8/tests/fetch_object.phpt
index d6b2714b99..57b7fc03d8 100644
--- a/ext/oci8/tests/fetch_object.phpt
+++ b/ext/oci8/tests/fetch_object.phpt
@@ -42,23 +42,41 @@ require dirname(__FILE__).'/drop_table.inc';
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
diff --git a/ext/oci8/tests/fetch_row.phpt b/ext/oci8/tests/fetch_row.phpt
index d8a68cabb7..a637ecc6f4 100644
--- a/ext/oci8/tests/fetch_row.phpt
+++ b/ext/oci8/tests/fetch_row.phpt
@@ -43,22 +43,40 @@ echo "Done\n";
?>
--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
diff --git a/ext/oci8/tests/field_funcs.phpt b/ext/oci8/tests/field_funcs.phpt
index 2f1dbd7109..72638226e3 100644
--- a/ext/oci8/tests/field_funcs.phpt
+++ b/ext/oci8/tests/field_funcs.phpt
@@ -97,7 +97,7 @@ int(0)
int(4000)
bool(true)
string(6) "STRING"
-string(7) "VARCHAR"
+string(8) "VARCHAR2"
int(1)
int(0)
int(0)
diff --git a/ext/oci8/tests/field_funcs_old.phpt b/ext/oci8/tests/field_funcs_old.phpt
index 8627f6a787..34af094291 100644
--- a/ext/oci8/tests/field_funcs_old.phpt
+++ b/ext/oci8/tests/field_funcs_old.phpt
@@ -97,7 +97,7 @@ int(0)
int(4000)
bool(true)
string(6) "STRING"
-string(7) "VARCHAR"
+string(8) "VARCHAR2"
int(1)
int(0)
int(0)