fix tests

diff --git a/ext/oci8/tests/cursors.phpt b/ext/oci8/tests/cursors.phpt
index 6c92a2b91ebfe48897693809c267910323dcde1f..22c89c9c5498c6e1ae336db90baa51995d3304cd 100644 (file)
--- 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 a3e393240052f2d2489c141ed22772a7817969bf..cc771d531958e76f11eccbe43fc6aea49569abbf 100644 (file)
--- 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 28408f9c939a7effd6829684b21f99919abf9cbc..8b358b612afab3e1dfa2e9f19e59144c62c93580 100644 (file)
--- 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 6734f6169532ff74bb21e9f9d33fd161ec09ecd4..83aae69f7dc98eee2e7aa5039b3e57539b6c8cc0 100644 (file)
--- 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 bfffd4e7de7419880d562c02a05e2c80964eb778..30782954260d7a3146f02802a8c323e917a1c74e 100644 (file)
--- 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 2c9590db51eab4933256734538e8aae8c52efe8e..7dacf2e5b257e6eb7d2d28caea8e18bcc5b1c672 100644 (file)
--- 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 d6b2714b990a34a5fc0d88837d357275af9b5e71..57b7fc03d81fcb77c53cdf076780d4678cea0b26 100644 (file)
--- 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 d8a68cabb741af3ad6bff6352629be541aae33f8..a637ecc6f447c01760cb517bf10bcd9082b559d8 100644 (file)
--- 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 2f1dbd7109b3913d2074639b8e5a61d1f9db0514..72638226e32806fe7bac83ab1092c78712299af6 100644 (file)
--- 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 8627f6a787c892d02bc0a6f02cfa69e2e0d7b20a..34af094291837f2ba5d78bb62271096127e335f4 100644 (file)
--- 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)