diff options
Diffstat (limited to 'ext/oci8/tests')
246 files changed, 1490 insertions, 1788 deletions
diff --git a/ext/oci8/tests/array_bind_009.phpt b/ext/oci8/tests/array_bind_009.phpt index b00efc0c24..b1edfa8474 100644 --- a/ext/oci8/tests/array_bind_009.phpt +++ b/ext/oci8/tests/array_bind_009.phpt @@ -8,10 +8,10 @@ oci_bind_array_by_name() and invalid values 9 require __DIR__.'/connect.inc'; var_dump(oci_bind_array_by_name($c, ":c1", $array, 5, 5, SQLT_CHR)); - -echo "Done\n"; ?> --EXPECTF-- -Warning: oci_bind_array_by_name(): supplied resource is not a valid oci8 statement resource in %s on line %d -bool(false) -Done +Fatal error: Uncaught TypeError: oci_bind_array_by_name(): supplied resource is not a valid oci8 statement resource in %s:%d +Stack trace: +#0 %s: oci_bind_array_by_name(%s) +#1 {main} + thrown in %s on line %d
\ No newline at end of file diff --git a/ext/oci8/tests/array_bind_013.phpt b/ext/oci8/tests/array_bind_013.phpt index 0d9ddabc15..a04bccf304 100644 --- a/ext/oci8/tests/array_bind_013.phpt +++ b/ext/oci8/tests/array_bind_013.phpt @@ -11,7 +11,12 @@ $statement = oci_parse($c, 'SELECT user FROM v$session'); $array = array(); -var_dump(oci_bind_array_by_name($statement, ":c1", $array, 5, -10, SQLT_CHR, -10)); +try { + var_dump(oci_bind_array_by_name($statement, ":c1", $array, 5, -10, SQLT_CHR, -10)); +} catch (ArgumentCountError $exception) { + echo $exception->getMessage() . "\n"; +} + var_dump(oci_bind_array_by_name($statement, ":c1", $array, 5, -10)); var_dump(oci_bind_array_by_name($statement, ":c1", $array, 5, -1)); var_dump(oci_bind_array_by_name($statement, ":c1", $array, 5, 0)); @@ -23,8 +28,7 @@ var_dump($array); echo "Done\n"; ?> --EXPECTF-- -Warning: oci_bind_array_by_name() expects at most 6 parameters, 7 given in %s on line %d -NULL +oci_bind_array_by_name() expects at most 6 parameters, 7 given Warning: oci_bind_array_by_name(): You must provide max length value for empty arrays in %s on line %d bool(false) diff --git a/ext/oci8/tests/array_bind_014.phpt b/ext/oci8/tests/array_bind_014.phpt index ca5823bc0f..abf7907739 100644 --- a/ext/oci8/tests/array_bind_014.phpt +++ b/ext/oci8/tests/array_bind_014.phpt @@ -47,8 +47,8 @@ $statement = oci_parse($c, $create_pkg_body); oci_execute($statement); for ($i = 1; $i < 6; $i++) { - $statement = oci_parse($c, "INSERT INTO bind_test VALUES (".$i.")"); - oci_execute($statement); + $statement = oci_parse($c, "INSERT INTO bind_test VALUES (".$i.")"); + oci_execute($statement); } $statement = oci_parse($c, "BEGIN array_bind_014_pkg.iobind(:c1); END;"); diff --git a/ext/oci8/tests/b47243_1.phpt b/ext/oci8/tests/b47243_1.phpt index 8e0b043518..826404021b 100644 --- a/ext/oci8/tests/b47243_1.phpt +++ b/ext/oci8/tests/b47243_1.phpt @@ -20,6 +20,5 @@ oci_fetch_all($s, $r); ?> ===DONE=== -<?php exit(0); ?> --EXPECT-- ===DONE=== diff --git a/ext/oci8/tests/b47243_2.phpt b/ext/oci8/tests/b47243_2.phpt index faf61e6c79..f7a9978978 100644 --- a/ext/oci8/tests/b47243_2.phpt +++ b/ext/oci8/tests/b47243_2.phpt @@ -21,6 +21,5 @@ oci_free_statement($s); ?> ===DONE=== -<?php exit(0); ?> --EXPECT-- ===DONE=== diff --git a/ext/oci8/tests/b47243_3.phpt b/ext/oci8/tests/b47243_3.phpt index 74eadc8df9..c9d9936c21 100644 --- a/ext/oci8/tests/b47243_3.phpt +++ b/ext/oci8/tests/b47243_3.phpt @@ -22,6 +22,5 @@ oci_close($c); ?> ===DONE=== -<?php exit(0); ?> --EXPECT-- ===DONE=== diff --git a/ext/oci8/tests/bind_boolean_1.phpt b/ext/oci8/tests/bind_boolean_1.phpt index 7c77187056..bd4ba356ec 100644 --- a/ext/oci8/tests/bind_boolean_1.phpt +++ b/ext/oci8/tests/bind_boolean_1.phpt @@ -100,8 +100,6 @@ oci_execute($s); var_dump($b1, $b2); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 bool(true) @@ -135,4 +133,3 @@ bool(true) bool(false) bool(false) bool(true) -===DONE=== diff --git a/ext/oci8/tests/bind_char_1.phpt b/ext/oci8/tests/bind_char_1.phpt index fbd1d65bd2..f405155980 100644 --- a/ext/oci8/tests/bind_char_1.phpt +++ b/ext/oci8/tests/bind_char_1.phpt @@ -20,11 +20,11 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "drop table bind_char_tab", - "create table bind_char_tab (id number, c1 char(10), c2 varchar2(10))", - "insert into bind_char_tab values (1, 'abc', NULL)", - "insert into bind_char_tab values (2, NULL, 'abc')", - "insert into bind_char_tab values (3, NULL, 'abc ')" + "drop table bind_char_tab", + "create table bind_char_tab (id number, c1 char(10), c2 varchar2(10))", + "insert into bind_char_tab values (1, 'abc', NULL)", + "insert into bind_char_tab values (2, NULL, 'abc')", + "insert into bind_char_tab values (3, NULL, 'abc ')" ); oci8_test_sql_execute($c, $stmtarray); @@ -39,32 +39,32 @@ echo "Test 1.1: Type: default. Length: default\n"; $s = oci_parse($c, "select * from bind_char_tab where c1 = :bv"); $r = oci_bind_by_name($s, ":bv", $bv1); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 1.2: Type: AFC. Length: default\n"; $r = oci_bind_by_name($s, ":bv", $bv1, -1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 1.3: Type: AFC: Length: 0\n"; $r = oci_bind_by_name($s, ":bv", $bv1, 0, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 1.4: Type: AFC: Length: strlen\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1), SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 1.5: Type: AFC. Length: strlen-1\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)-1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 1.6: Type: AFC. Length: strlen+1\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)+1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "\n\n*** NULL data tests against CHAR ***\n"; @@ -74,32 +74,32 @@ echo "Test 2.1: Type: default. Length: default\n"; $s = oci_parse($c, "select * from bind_char_tab where c1 = :bv"); $r = oci_bind_by_name($s, ":bv", $bv1); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 2.2: Type: AFC. Length: default\n"; $r = oci_bind_by_name($s, ":bv", $bv1, -1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 2.3: Type: AFC: Length: 0\n"; $r = oci_bind_by_name($s, ":bv", $bv1, 0, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 2.4: Type: AFC: Length: strlen\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1), SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 2.5: Type: AFC. Length: strlen-1\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)-1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 2.6: Type: AFC. Length: strlen+1\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)+1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "\n\n*** Non-null Data Tests against VARCHAR2***\n"; @@ -110,32 +110,32 @@ echo "Test 3.1: Type: default. Length: default\n"; $s = oci_parse($c, "select * from bind_char_tab where c2 = :bv"); $r = oci_bind_by_name($s, ":bv", $bv1); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 3.2: Type: AFC. Length: default\n"; $r = oci_bind_by_name($s, ":bv", $bv1, -1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 3.3: Type: AFC: Length: 0\n"; $r = oci_bind_by_name($s, ":bv", $bv1, 0, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 3.4: Type: AFC: Length: strlen\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1), SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 3.5: Type: AFC. Length: strlen-1\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)-1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 3.6: Type: AFC. Length: strlen+1\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)+1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "\n\n*** NULL data tests against VARCHAR2 ***\n"; @@ -146,55 +146,55 @@ echo "Test 4.1: Type: default. Length: default\n"; $s = oci_parse($c, "select * from bind_char_tab where c2 = :bv"); $r = oci_bind_by_name($s, ":bv", $bv1); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 4.2: Type: AFC. Length: default\n"; $r = oci_bind_by_name($s, ":bv", $bv1, -1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 4.3: Type: AFC: Length: 0\n"; $r = oci_bind_by_name($s, ":bv", $bv1, 0, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 4.4: Type: AFC: Length: strlen\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1), SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 4.5: Type: AFC. Length: strlen-1\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)-1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 4.6: Type: AFC. Length: strlen+1\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)+1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); function do_e_q($s) { - echo " Querying:\n"; - - $r = @oci_execute($s); - if (!$r) { - $m = oci_error($s); - echo " Oci_execute error ORA-".$m['code']." Exiting Query\n"; - return; - } - while ($row = oci_fetch_array($s, OCI_ASSOC+OCI_RETURN_NULLS)) { - foreach ($row as $item) { - echo " :" . $item . ":\n"; - } - } + echo " Querying:\n"; + + $r = @oci_execute($s); + if (!$r) { + $m = oci_error($s); + echo " Oci_execute error ORA-".$m['code']." Exiting Query\n"; + return; + } + while ($row = oci_fetch_array($s, OCI_ASSOC+OCI_RETURN_NULLS)) { + foreach ($row as $item) { + echo " :" . $item . ":\n"; + } + } } // Cleanup $stmtarray = array( - "drop table bind_char_tab" + "drop table bind_char_tab" ); oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/bind_char_1_11gR1.phpt b/ext/oci8/tests/bind_char_1_11gR1.phpt index ea49c96b75..d281833a77 100644 --- a/ext/oci8/tests/bind_char_1_11gR1.phpt +++ b/ext/oci8/tests/bind_char_1_11gR1.phpt @@ -22,11 +22,11 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "drop table bind_char_tab", - "create table bind_char_tab (id number, c1 char(10), c2 varchar2(10))", - "insert into bind_char_tab values (1, 'abc', NULL)", - "insert into bind_char_tab values (2, NULL, 'abc')", - "insert into bind_char_tab values (3, NULL, 'abc ')" + "drop table bind_char_tab", + "create table bind_char_tab (id number, c1 char(10), c2 varchar2(10))", + "insert into bind_char_tab values (1, 'abc', NULL)", + "insert into bind_char_tab values (2, NULL, 'abc')", + "insert into bind_char_tab values (3, NULL, 'abc ')" ); oci8_test_sql_execute($c, $stmtarray); @@ -41,32 +41,32 @@ echo "Test 1.1: Type: default. Length: default\n"; $s = oci_parse($c, "select * from bind_char_tab where c1 = :bv"); $r = oci_bind_by_name($s, ":bv", $bv1); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 1.2: Type: AFC. Length: default\n"; $r = oci_bind_by_name($s, ":bv", $bv1, -1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 1.3: Type: AFC: Length: 0\n"; $r = oci_bind_by_name($s, ":bv", $bv1, 0, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 1.4: Type: AFC: Length: strlen\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1), SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 1.5: Type: AFC. Length: strlen-1\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)-1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 1.6: Type: AFC. Length: strlen+1\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)+1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "\n\n*** NULL data tests against CHAR ***\n"; @@ -76,32 +76,32 @@ echo "Test 2.1: Type: default. Length: default\n"; $s = oci_parse($c, "select * from bind_char_tab where c1 = :bv"); $r = oci_bind_by_name($s, ":bv", $bv1); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 2.2: Type: AFC. Length: default\n"; $r = oci_bind_by_name($s, ":bv", $bv1, -1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 2.3: Type: AFC: Length: 0\n"; $r = oci_bind_by_name($s, ":bv", $bv1, 0, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 2.4: Type: AFC: Length: strlen\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1), SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 2.5: Type: AFC. Length: strlen-1\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)-1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 2.6: Type: AFC. Length: strlen+1\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)+1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "\n\n*** Non-null Data Tests against VARCHAR2***\n"; @@ -112,32 +112,32 @@ echo "Test 3.1: Type: default. Length: default\n"; $s = oci_parse($c, "select * from bind_char_tab where c2 = :bv"); $r = oci_bind_by_name($s, ":bv", $bv1); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 3.2: Type: AFC. Length: default\n"; $r = oci_bind_by_name($s, ":bv", $bv1, -1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 3.3: Type: AFC: Length: 0\n"; $r = oci_bind_by_name($s, ":bv", $bv1, 0, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 3.4: Type: AFC: Length: strlen\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1), SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 3.5: Type: AFC. Length: strlen-1\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)-1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 3.6: Type: AFC. Length: strlen+1\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)+1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "\n\n*** NULL data tests against VARCHAR2 ***\n"; @@ -148,55 +148,55 @@ echo "Test 4.1: Type: default. Length: default\n"; $s = oci_parse($c, "select * from bind_char_tab where c2 = :bv"); $r = oci_bind_by_name($s, ":bv", $bv1); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 4.2: Type: AFC. Length: default\n"; $r = oci_bind_by_name($s, ":bv", $bv1, -1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 4.3: Type: AFC: Length: 0\n"; $r = oci_bind_by_name($s, ":bv", $bv1, 0, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 4.4: Type: AFC: Length: strlen\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1), SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 4.5: Type: AFC. Length: strlen-1\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)-1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 4.6: Type: AFC. Length: strlen+1\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)+1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); function do_e_q($s) { - echo " Querying:\n"; - - $r = @oci_execute($s); - if (!$r) { - $m = oci_error($s); - echo " Oci_execute error ORA-".$m['code']." Exiting Query\n"; - return; - } - while ($row = oci_fetch_array($s, OCI_ASSOC+OCI_RETURN_NULLS)) { - foreach ($row as $item) { - echo " :" . $item . ":\n"; - } - } + echo " Querying:\n"; + + $r = @oci_execute($s); + if (!$r) { + $m = oci_error($s); + echo " Oci_execute error ORA-".$m['code']." Exiting Query\n"; + return; + } + while ($row = oci_fetch_array($s, OCI_ASSOC+OCI_RETURN_NULLS)) { + foreach ($row as $item) { + echo " :" . $item . ":\n"; + } + } } // Cleanup $stmtarray = array( - "drop table bind_char_tab" + "drop table bind_char_tab" ); oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/bind_char_2.phpt b/ext/oci8/tests/bind_char_2.phpt index 8200dcf368..1e5fb08a94 100644 --- a/ext/oci8/tests/bind_char_2.phpt +++ b/ext/oci8/tests/bind_char_2.phpt @@ -20,10 +20,10 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "alter session set nls_date_format='YYYY-MM-DD'", - "drop table bind_char_tab", - "create table bind_char_tab (id number, c1 date)", - "insert into bind_char_tab values (1, '2008-04-20')", + "alter session set nls_date_format='YYYY-MM-DD'", + "drop table bind_char_tab", + "create table bind_char_tab (id number, c1 date)", + "insert into bind_char_tab values (1, '2008-04-20')", ); oci8_test_sql_execute($c, $stmtarray); @@ -41,49 +41,49 @@ if ($r) echo "Test 1.2: Type: AFC. Length: default\n"; $r = oci_bind_by_name($s, ":bv", $bv1, -1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 1.3: Type: AFC: Length: 0\n"; $r = oci_bind_by_name($s, ":bv", $bv1, 0, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 1.4: Type: AFC: Length: strlen\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1), SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 1.5: Type: AFC. Length: strlen-1\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)-1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 1.6: Type: AFC. Length: strlen+1\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)+1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); function do_e_q($s) { - echo " Querying:\n"; - - $r = @oci_execute($s); - if (!$r) { - $m = oci_error($s); - echo " Oci_execute error ORA-".$m['code']." Exiting Query\n"; - return; - } - while ($row = oci_fetch_array($s, OCI_ASSOC+OCI_RETURN_NULLS)) { - foreach ($row as $item) { - echo " :" . $item . ":\n"; - } - } + echo " Querying:\n"; + + $r = @oci_execute($s); + if (!$r) { + $m = oci_error($s); + echo " Oci_execute error ORA-".$m['code']." Exiting Query\n"; + return; + } + while ($row = oci_fetch_array($s, OCI_ASSOC+OCI_RETURN_NULLS)) { + foreach ($row as $item) { + echo " :" . $item . ":\n"; + } + } } // Cleanup $stmtarray = array( - "drop table bind_char_tab" + "drop table bind_char_tab" ); oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/bind_char_2_11gR1.phpt b/ext/oci8/tests/bind_char_2_11gR1.phpt index 3ee9648221..11ed50fb83 100644 --- a/ext/oci8/tests/bind_char_2_11gR1.phpt +++ b/ext/oci8/tests/bind_char_2_11gR1.phpt @@ -20,10 +20,10 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "alter session set nls_date_format='YYYY-MM-DD'", - "drop table bind_char_tab", - "create table bind_char_tab (id number, c1 date)", - "insert into bind_char_tab values (1, '2008-04-20')", + "alter session set nls_date_format='YYYY-MM-DD'", + "drop table bind_char_tab", + "create table bind_char_tab (id number, c1 date)", + "insert into bind_char_tab values (1, '2008-04-20')", ); oci8_test_sql_execute($c, $stmtarray); @@ -41,49 +41,49 @@ if ($r) echo "Test 1.2: Type: AFC. Length: default\n"; $r = oci_bind_by_name($s, ":bv", $bv1, -1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 1.3: Type: AFC: Length: 0\n"; $r = oci_bind_by_name($s, ":bv", $bv1, 0, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 1.4: Type: AFC: Length: strlen\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1), SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 1.5: Type: AFC. Length: strlen-1\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)-1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); echo "Test 1.6: Type: AFC. Length: strlen+1\n"; $r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)+1, SQLT_AFC); if ($r) - do_e_q($s); + do_e_q($s); function do_e_q($s) { - echo " Querying:\n"; - - $r = @oci_execute($s); - if (!$r) { - $m = oci_error($s); - echo " Oci_execute error ORA-".$m['code']." Exiting Query\n"; - return; - } - while ($row = oci_fetch_array($s, OCI_ASSOC+OCI_RETURN_NULLS)) { - foreach ($row as $item) { - echo " :" . $item . ":\n"; - } - } + echo " Querying:\n"; + + $r = @oci_execute($s); + if (!$r) { + $m = oci_error($s); + echo " Oci_execute error ORA-".$m['code']." Exiting Query\n"; + return; + } + while ($row = oci_fetch_array($s, OCI_ASSOC+OCI_RETURN_NULLS)) { + foreach ($row as $item) { + echo " :" . $item . ":\n"; + } + } } // Cleanup $stmtarray = array( - "drop table bind_char_tab" + "drop table bind_char_tab" ); oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/bind_char_3.phpt b/ext/oci8/tests/bind_char_3.phpt index f4d8c1f242..62f767367e 100644 --- a/ext/oci8/tests/bind_char_3.phpt +++ b/ext/oci8/tests/bind_char_3.phpt @@ -20,7 +20,7 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "create or replace function bind_char_3_fn(p1 char) return char as begin return p1; end;", + "create or replace function bind_char_3_fn(p1 char) return char as begin return p1; end;", ); oci8_test_sql_execute($c, $stmtarray); @@ -33,7 +33,7 @@ $s = oci_parse($c, "begin :bv2 := bind_char_3_fn(:bv1); end;"); $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1) && oci_bind_by_name($s, ':bv2', $bv2); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); echo "Test 1.2 In Length: default. In Type: default. Out Length: 10. Out Type: default\n"; @@ -41,7 +41,7 @@ echo "Test 1.2 In Length: default. In Type: default. Out Length: 10. $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -50,7 +50,7 @@ echo "Test 1.3 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -60,7 +60,7 @@ echo "Test 1.4 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -69,7 +69,7 @@ echo "Test 1.5 In Length: strlen. In Type: AFC. Out Length: strlen(input) $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1, strlen($bv1), SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, strlen($bv1), SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -78,7 +78,7 @@ echo "Test 1.6 In Length: strlen. In Type: AFC. Out Length: strlen(input) $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1, strlen($bv1), SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, strlen($bv1)-1, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -87,7 +87,7 @@ echo "Test 1.7 In Length: strlen. In Type: AFC. Out Length: strlen(input) $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1, strlen($bv1), SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, strlen($bv1)+1, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -98,7 +98,7 @@ echo "Test 2.1 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -106,7 +106,7 @@ echo "Test 2.2 In Length: default. In Type: default. Out Length: 10. $r = oci_bind_by_name($s, ':bv1', $bv1) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -116,7 +116,7 @@ echo "Test 2.3 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -126,7 +126,7 @@ echo "Test 2.4 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -136,7 +136,7 @@ echo "Test 2.5 In Length: -1. In Type: AFC. Out Length: 0. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 0, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -146,7 +146,7 @@ echo "Test 2.6 In Length: 0. In Type: AFC. Out Length: 0. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, 0, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 0, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -156,7 +156,7 @@ echo "Test 2.7 In Length: 1. In Type: AFC. Out Length: 1. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, 1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 1, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -168,7 +168,7 @@ echo "Test 3.1 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -177,7 +177,7 @@ echo "Test 3.2 In Length: default. In Type: default. Out Length: 10. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -187,7 +187,7 @@ echo "Test 3.3 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -197,7 +197,7 @@ echo "Test 3.4 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -206,7 +206,7 @@ echo "Test 3.5 In Length: -1. In Type: AFC. Out Length: 0. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 0, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -216,26 +216,26 @@ echo "Test 3.6 In Length: -1. In Type: AFC. Out Length: 1. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 1, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); function do_e($s) { - echo " Executing:\n"; - - $r = @oci_execute($s); - if (!$r) { - $m = oci_error($s); - echo " Oci_execute error ORA-".$m['code']."\n"; - return; - } + echo " Executing:\n"; + + $r = @oci_execute($s); + if (!$r) { + $m = oci_error($s); + echo " Oci_execute error ORA-".$m['code']."\n"; + return; + } } // Cleanup $stmtarray = array( - "drop function bind_char_3_fn" + "drop function bind_char_3_fn" ); oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/bind_char_3_11gR1.phpt b/ext/oci8/tests/bind_char_3_11gR1.phpt index 1adcae2a74..c809101199 100644 --- a/ext/oci8/tests/bind_char_3_11gR1.phpt +++ b/ext/oci8/tests/bind_char_3_11gR1.phpt @@ -20,7 +20,7 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "create or replace function bind_char_3_fn(p1 char) return char as begin return p1; end;", + "create or replace function bind_char_3_fn(p1 char) return char as begin return p1; end;", ); oci8_test_sql_execute($c, $stmtarray); @@ -33,7 +33,7 @@ $s = oci_parse($c, "begin :bv2 := bind_char_3_fn(:bv1); end;"); $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1) && oci_bind_by_name($s, ':bv2', $bv2); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); echo "Test 1.2 In Length: default. In Type: default. Out Length: 10. Out Type: default\n"; @@ -41,7 +41,7 @@ echo "Test 1.2 In Length: default. In Type: default. Out Length: 10. $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -50,7 +50,7 @@ echo "Test 1.3 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -60,7 +60,7 @@ echo "Test 1.4 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -69,7 +69,7 @@ echo "Test 1.5 In Length: strlen. In Type: AFC. Out Length: strlen(input) $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1, strlen($bv1), SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, strlen($bv1), SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -78,7 +78,7 @@ echo "Test 1.6 In Length: strlen. In Type: AFC. Out Length: strlen(input) $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1, strlen($bv1), SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, strlen($bv1)-1, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -87,7 +87,7 @@ echo "Test 1.7 In Length: strlen. In Type: AFC. Out Length: strlen(input) $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1, strlen($bv1), SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, strlen($bv1)+1, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -98,7 +98,7 @@ echo "Test 2.1 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -106,7 +106,7 @@ echo "Test 2.2 In Length: default. In Type: default. Out Length: 10. $r = oci_bind_by_name($s, ':bv1', $bv1) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -116,7 +116,7 @@ echo "Test 2.3 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -126,7 +126,7 @@ echo "Test 2.4 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -136,7 +136,7 @@ echo "Test 2.5 In Length: -1. In Type: AFC. Out Length: 0. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 0, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -146,7 +146,7 @@ echo "Test 2.6 In Length: 0. In Type: AFC. Out Length: 0. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, 0, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 0, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -156,7 +156,7 @@ echo "Test 2.7 In Length: 1. In Type: AFC. Out Length: 1. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, 1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 1, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -168,7 +168,7 @@ echo "Test 3.1 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -177,7 +177,7 @@ echo "Test 3.2 In Length: default. In Type: default. Out Length: 10. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -187,7 +187,7 @@ echo "Test 3.3 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -197,7 +197,7 @@ echo "Test 3.4 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -206,7 +206,7 @@ echo "Test 3.5 In Length: -1. In Type: AFC. Out Length: 0. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 0, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -216,26 +216,26 @@ echo "Test 3.6 In Length: -1. In Type: AFC. Out Length: 1. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 1, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); function do_e($s) { - echo " Executing:\n"; - - $r = @oci_execute($s); - if (!$r) { - $m = oci_error($s); - echo " Oci_execute error ORA-".$m['code']."\n"; - return; - } + echo " Executing:\n"; + + $r = @oci_execute($s); + if (!$r) { + $m = oci_error($s); + echo " Oci_execute error ORA-".$m['code']."\n"; + return; + } } // Cleanup $stmtarray = array( - "drop function bind_char_3_fn" + "drop function bind_char_3_fn" ); oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/bind_char_4.phpt b/ext/oci8/tests/bind_char_4.phpt index 218f0b03cf..627ba45e86 100644 --- a/ext/oci8/tests/bind_char_4.phpt +++ b/ext/oci8/tests/bind_char_4.phpt @@ -22,7 +22,7 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "create or replace function bind_char_3_fn(p1 varchar2) return varchar2 as begin return p1; end;", + "create or replace function bind_char_3_fn(p1 varchar2) return varchar2 as begin return p1; end;", ); oci8_test_sql_execute($c, $stmtarray); @@ -35,7 +35,7 @@ $s = oci_parse($c, "begin :bv2 := bind_char_3_fn(:bv1); end;"); $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1) && oci_bind_by_name($s, ':bv2', $bv2); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); echo "Test 1.2 In Length: default. In Type: default. Out Length: 10. Out Type: default\n"; @@ -43,7 +43,7 @@ echo "Test 1.2 In Length: default. In Type: default. Out Length: 10. $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -52,7 +52,7 @@ echo "Test 1.3 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -62,7 +62,7 @@ echo "Test 1.4 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -71,7 +71,7 @@ echo "Test 1.5 In Length: strlen. In Type: AFC. Out Length: strlen(input) $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1, strlen($bv1), SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, strlen($bv1), SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -80,7 +80,7 @@ echo "Test 1.6 In Length: strlen. In Type: AFC. Out Length: strlen(input) $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1, strlen($bv1), SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, strlen($bv1)-1, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -89,7 +89,7 @@ echo "Test 1.7 In Length: strlen. In Type: AFC. Out Length: strlen(input) $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1, strlen($bv1), SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, strlen($bv1)+1, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -100,7 +100,7 @@ echo "Test 2.1 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -108,7 +108,7 @@ echo "Test 2.2 In Length: default. In Type: default. Out Length: 10. $r = oci_bind_by_name($s, ':bv1', $bv1) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -118,7 +118,7 @@ echo "Test 2.3 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -128,7 +128,7 @@ echo "Test 2.4 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -138,7 +138,7 @@ echo "Test 2.5 In Length: -1. In Type: AFC. Out Length: 0. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 0, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -148,7 +148,7 @@ echo "Test 2.6 In Length: 0. In Type: AFC. Out Length: 0. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, 0, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 0, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -158,7 +158,7 @@ echo "Test 2.7 In Length: 1. In Type: AFC. Out Length: 1. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, 1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 1, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -170,7 +170,7 @@ echo "Test 3.1 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -179,7 +179,7 @@ echo "Test 3.2 In Length: default. In Type: default. Out Length: 10. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -189,7 +189,7 @@ echo "Test 3.3 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -199,7 +199,7 @@ echo "Test 3.4 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -208,7 +208,7 @@ echo "Test 3.5 In Length: -1. In Type: AFC. Out Length: 0. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 0, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -218,26 +218,26 @@ echo "Test 3.6 In Length: -1. In Type: AFC. Out Length: 1. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 1, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); function do_e($s) { - echo " Executing:\n"; - - $r = @oci_execute($s); - if (!$r) { - $m = oci_error($s); - echo " Oci_execute error ORA-".$m['code']."\n"; - return; - } + echo " Executing:\n"; + + $r = @oci_execute($s); + if (!$r) { + $m = oci_error($s); + echo " Oci_execute error ORA-".$m['code']."\n"; + return; + } } // Cleanup $stmtarray = array( - "drop function bind_char_3_fn" + "drop function bind_char_3_fn" ); oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/bind_char_4_11gR1.phpt b/ext/oci8/tests/bind_char_4_11gR1.phpt index 51350e533e..e40887c450 100644 --- a/ext/oci8/tests/bind_char_4_11gR1.phpt +++ b/ext/oci8/tests/bind_char_4_11gR1.phpt @@ -22,7 +22,7 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "create or replace function bind_char_3_fn(p1 varchar2) return varchar2 as begin return p1; end;", + "create or replace function bind_char_3_fn(p1 varchar2) return varchar2 as begin return p1; end;", ); oci8_test_sql_execute($c, $stmtarray); @@ -35,7 +35,7 @@ $s = oci_parse($c, "begin :bv2 := bind_char_3_fn(:bv1); end;"); $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1) && oci_bind_by_name($s, ':bv2', $bv2); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); echo "Test 1.2 In Length: default. In Type: default. Out Length: 10. Out Type: default\n"; @@ -43,7 +43,7 @@ echo "Test 1.2 In Length: default. In Type: default. Out Length: 10. $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -52,7 +52,7 @@ echo "Test 1.3 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -62,7 +62,7 @@ echo "Test 1.4 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -71,7 +71,7 @@ echo "Test 1.5 In Length: strlen. In Type: AFC. Out Length: strlen(input) $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1, strlen($bv1), SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, strlen($bv1), SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -80,7 +80,7 @@ echo "Test 1.6 In Length: strlen. In Type: AFC. Out Length: strlen(input) $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1, strlen($bv1), SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, strlen($bv1)-1, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -89,7 +89,7 @@ echo "Test 1.7 In Length: strlen. In Type: AFC. Out Length: strlen(input) $bv1 = 'abc'; $r = oci_bind_by_name($s, ':bv1', $bv1, strlen($bv1), SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, strlen($bv1)+1, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -100,7 +100,7 @@ echo "Test 2.1 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -108,7 +108,7 @@ echo "Test 2.2 In Length: default. In Type: default. Out Length: 10. $r = oci_bind_by_name($s, ':bv1', $bv1) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -118,7 +118,7 @@ echo "Test 2.3 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -128,7 +128,7 @@ echo "Test 2.4 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -138,7 +138,7 @@ echo "Test 2.5 In Length: -1. In Type: AFC. Out Length: 0. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 0, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -148,7 +148,7 @@ echo "Test 2.6 In Length: 0. In Type: AFC. Out Length: 0. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, 0, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 0, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -158,7 +158,7 @@ echo "Test 2.7 In Length: 1. In Type: AFC. Out Length: 1. $bv1 = ''; $r = oci_bind_by_name($s, ':bv1', $bv1, 1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 1, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -170,7 +170,7 @@ echo "Test 3.1 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -179,7 +179,7 @@ echo "Test 3.2 In Length: default. In Type: default. Out Length: 10. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -189,7 +189,7 @@ echo "Test 3.3 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -199,7 +199,7 @@ echo "Test 3.4 In Length: -1. In Type: AFC. Out Length: 10. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 10, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -208,7 +208,7 @@ echo "Test 3.5 In Length: -1. In Type: AFC. Out Length: 0. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 0, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); @@ -218,26 +218,26 @@ echo "Test 3.6 In Length: -1. In Type: AFC. Out Length: 1. $bv1 = null; $r = oci_bind_by_name($s, ':bv1', $bv1, -1, SQLT_AFC) && oci_bind_by_name($s, ':bv2', $bv2, 1, SQLT_AFC); if ($r) - do_e($s); + do_e($s); var_dump($bv1, $bv2); function do_e($s) { - echo " Executing:\n"; - - $r = @oci_execute($s); - if (!$r) { - $m = oci_error($s); - echo " Oci_execute error ORA-".$m['code']."\n"; - return; - } + echo " Executing:\n"; + + $r = @oci_execute($s); + if (!$r) { + $m = oci_error($s); + echo " Oci_execute error ORA-".$m['code']."\n"; + return; + } } // Cleanup $stmtarray = array( - "drop function bind_char_3_fn" + "drop function bind_char_3_fn" ); oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/bind_empty.phpt b/ext/oci8/tests/bind_empty.phpt index ae8cbbca2d..62ec898abb 100644 --- a/ext/oci8/tests/bind_empty.phpt +++ b/ext/oci8/tests/bind_empty.phpt @@ -89,8 +89,6 @@ $statement = oci_parse($c, $drop); @oci_execute($statement); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 bool(true) @@ -124,4 +122,3 @@ NULL Test 6 NULL NULL -===DONE=== diff --git a/ext/oci8/tests/bind_misccoltypes.phpt b/ext/oci8/tests/bind_misccoltypes.phpt index 0cc307b4d4..928256ad6b 100644 --- a/ext/oci8/tests/bind_misccoltypes.phpt +++ b/ext/oci8/tests/bind_misccoltypes.phpt @@ -16,9 +16,9 @@ $stmtarray = array( "alter session set nls_date_format = 'DD-MON-YY'", - "drop table bind_misccoltypes_tab", + "drop table bind_misccoltypes_tab", - "create table bind_misccoltypes_tab ( + "create table bind_misccoltypes_tab ( id number, char_t char(1), char_t10 char(10), @@ -260,7 +260,7 @@ check_col($c, 'date_t', 60); // Clean up $stmtarray = array( - "drop table bind_misccoltypes_tab" + "drop table bind_misccoltypes_tab" ); oci8_test_sql_execute($c, $stmtarray); @@ -268,8 +268,6 @@ oci8_test_sql_execute($c, $stmtarray); oci_close($c); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- TEST86 insert all ORATYPE values @@ -363,4 +361,3 @@ array(1) { string(9) "09-APR-10" } } -===DONE=== diff --git a/ext/oci8/tests/bind_misccoltypes_errs.phpt b/ext/oci8/tests/bind_misccoltypes_errs.phpt index 5c443d0f69..4f5de46e80 100644 --- a/ext/oci8/tests/bind_misccoltypes_errs.phpt +++ b/ext/oci8/tests/bind_misccoltypes_errs.phpt @@ -10,9 +10,9 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "drop table bind_misccoltypes_errs_tab", + "drop table bind_misccoltypes_errs_tab", - "create table bind_misccoltypes_errs_tab ( + "create table bind_misccoltypes_errs_tab ( id number, char_t char(1), char_t10 char(10), @@ -108,7 +108,7 @@ check_col($c, 'varchar2_t10', 7); // Clean up $stmtarray = array( - "drop table bind_misccoltypes_errs_tab" + "drop table bind_misccoltypes_errs_tab" ); oci8_test_sql_execute($c, $stmtarray); @@ -116,8 +116,6 @@ oci8_test_sql_execute($c, $stmtarray); oci_close($c); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 insert numbers @@ -166,4 +164,3 @@ array(1) { array(0) { } } -===DONE=== diff --git a/ext/oci8/tests/bind_number.phpt b/ext/oci8/tests/bind_number.phpt index 429bbe0ef7..851f2da605 100644 --- a/ext/oci8/tests/bind_number.phpt +++ b/ext/oci8/tests/bind_number.phpt @@ -14,26 +14,26 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "drop table bind_number_tab", - "create table bind_number_tab ( - id number, - number_t6 number(6), - float_t float, - binary_float_t binary_float, - binary_double_t binary_double, - decimal_t decimal, - integer_t integer)" + "drop table bind_number_tab", + "create table bind_number_tab ( + id number, + number_t6 number(6), + float_t float, + binary_float_t binary_float, + binary_double_t binary_double, + decimal_t decimal, + integer_t integer)" ); oci8_test_sql_execute($c, $stmtarray); function check_col($c, $colname, $id) { - $s = oci_parse($c, "select $colname from bind_number_tab where id = :id"); - oci_bind_by_name($s, ":id", $id); - oci_execute($s); - oci_fetch_all($s, $r); - var_dump($r); + $s = oci_parse($c, "select $colname from bind_number_tab where id = :id"); + oci_bind_by_name($s, ":id", $id); + oci_execute($s); + oci_fetch_all($s, $r); + var_dump($r); } // Run Test @@ -123,14 +123,12 @@ check_col($c, 'integer_t', 76); // Clean up $stmtarray = array( - "drop table bind_number_tab" + "drop table bind_number_tab" ); oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 - invalid number @@ -212,4 +210,3 @@ array(1) { string(2) "42" } } -===DONE=== diff --git a/ext/oci8/tests/bind_query.phpt b/ext/oci8/tests/bind_query.phpt index 12e58d3e33..9c1fa3d8d1 100644 --- a/ext/oci8/tests/bind_query.phpt +++ b/ext/oci8/tests/bind_query.phpt @@ -10,10 +10,10 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "drop table bind_query_tab", - "create table bind_query_tab (empno number(4), ename varchar2(10), sal number(7,2))", - "insert into bind_query_tab values (7934, 'MILLER', 1300)", - "insert into bind_query_tab values (7902, 'FORD', 3000)" + "drop table bind_query_tab", + "create table bind_query_tab (empno number(4), ename varchar2(10), sal number(7,2))", + "insert into bind_query_tab values (7934, 'MILLER', 1300)", + "insert into bind_query_tab values (7902, 'FORD', 3000)" ); oci8_test_sql_execute($c, $stmtarray); @@ -56,14 +56,12 @@ while (oci_fetch($s)) { // Clean up $stmtarray = array( - "drop table bind_query_tab" + "drop table bind_query_tab" ); oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 array(1) { @@ -75,4 +73,3 @@ string(4) "FORD" string(6) "MILLER" Test 3 string(4) "FORD" -===DONE=== diff --git a/ext/oci8/tests/bind_rowid.phpt b/ext/oci8/tests/bind_rowid.phpt index 40e5b5e90e..1652326356 100644 --- a/ext/oci8/tests/bind_rowid.phpt +++ b/ext/oci8/tests/bind_rowid.phpt @@ -9,19 +9,19 @@ require(__DIR__."/connect.inc"); function do_query($c) { - $s = oci_parse($c, 'select address from rid_tab order by id'); - $id = 1; - oci_execute($s, OCI_DEFAULT); - while ($row = oci_fetch_array($s, OCI_ASSOC+OCI_RETURN_NULLS)) { - var_dump($row); - } + $s = oci_parse($c, 'select address from rid_tab order by id'); + $id = 1; + oci_execute($s, OCI_DEFAULT); + while ($row = oci_fetch_array($s, OCI_ASSOC+OCI_RETURN_NULLS)) { + var_dump($row); + } } $stmtarray = array( - "drop table rid_tab", - "create table rid_tab (id number, address varchar2(40))", - "insert into rid_tab (id, address) values (1, 'original text #1')", - "insert into rid_tab (id, address) values (2, 'original text #2')" + "drop table rid_tab", + "create table rid_tab (id number, address varchar2(40))", + "insert into rid_tab (id, address) values (1, 'original text #1')", + "insert into rid_tab (id, address) values (2, 'original text #2')" ); oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/bind_sqltafc.phpt b/ext/oci8/tests/bind_sqltafc.phpt index 90bd38f445..8b4fea93bf 100644 --- a/ext/oci8/tests/bind_sqltafc.phpt +++ b/ext/oci8/tests/bind_sqltafc.phpt @@ -10,9 +10,9 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "drop table bind_sqltafc_tab", - "create table bind_sqltafc_tab (id number, char_t char(1), char_t10 char(10), varchar2_t10 varchar2(10), number_t number)", - "insert into bind_sqltafc_tab values (0, 'a', 'abcd', 'efghij', 1.1)" + "drop table bind_sqltafc_tab", + "create table bind_sqltafc_tab (id number, char_t char(1), char_t10 char(10), varchar2_t10 varchar2(10), number_t number)", + "insert into bind_sqltafc_tab values (0, 'a', 'abcd', 'efghij', 1.1)" ); oci8_test_sql_execute($c, $stmtarray); @@ -79,7 +79,7 @@ q($c, 6); // Clean up $stmtarray = array( - "drop table bind_sqltafc_tab" + "drop table bind_sqltafc_tab" ); oci8_test_sql_execute($c, $stmtarray); @@ -87,8 +87,6 @@ oci8_test_sql_execute($c, $stmtarray); oci_close($c); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 0 - base table creation without binds array(5) { @@ -205,4 +203,3 @@ array(5) { NULL } } -===DONE=== diff --git a/ext/oci8/tests/bind_sqltchr_1.phpt b/ext/oci8/tests/bind_sqltchr_1.phpt index b8c460ca79..0ef7274498 100644 --- a/ext/oci8/tests/bind_sqltchr_1.phpt +++ b/ext/oci8/tests/bind_sqltchr_1.phpt @@ -133,8 +133,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- TEST241 bind SQLT_CHR array(1) { @@ -225,4 +223,3 @@ array(1) { NULL } } -===DONE=== diff --git a/ext/oci8/tests/bind_sqltchr_2.phpt b/ext/oci8/tests/bind_sqltchr_2.phpt index fae96d8925..d054d21f57 100644 --- a/ext/oci8/tests/bind_sqltchr_2.phpt +++ b/ext/oci8/tests/bind_sqltchr_2.phpt @@ -41,10 +41,7 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 - PL/SQL IN and OUT variables string(22) "Cat got your keyboard?" string(22) "CAT GOT YOUR KEYBOARD?" -===DONE=== diff --git a/ext/oci8/tests/bind_sqltint.phpt b/ext/oci8/tests/bind_sqltint.phpt index 0924652155..a25265f90a 100644 --- a/ext/oci8/tests/bind_sqltint.phpt +++ b/ext/oci8/tests/bind_sqltint.phpt @@ -10,7 +10,7 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "drop table bind_sqltint_tab", + "drop table bind_sqltint_tab", "create table bind_sqltint_tab ( id number, @@ -208,14 +208,12 @@ var_dump($p2); // Clean up $stmtarray = array( - "drop table bind_sqltint_tab" + "drop table bind_sqltint_tab" ); oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- TEST141 wrong bind type SQLT_INT array(1) { @@ -333,4 +331,3 @@ int(4444) TEST159 int(5555) -===DONE=== diff --git a/ext/oci8/tests/bind_sqltnum.phpt b/ext/oci8/tests/bind_sqltnum.phpt index b8742ee8a8..3f8e371ea3 100644 --- a/ext/oci8/tests/bind_sqltnum.phpt +++ b/ext/oci8/tests/bind_sqltnum.phpt @@ -16,7 +16,7 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "drop table bind_sqltnum_tab", + "drop table bind_sqltnum_tab", "create table bind_sqltnum_tab ( id number, @@ -165,14 +165,12 @@ check_col($c, 'number_t92', 50); // Clean up $stmtarray = array( - "drop table bind_sqltnum_tab" + "drop table bind_sqltnum_tab" ); oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 - baseline test array(2) { @@ -276,4 +274,3 @@ array(1) { array(0) { } } -===DONE=== diff --git a/ext/oci8/tests/bind_sqltnum_11g.phpt b/ext/oci8/tests/bind_sqltnum_11g.phpt index 7ef1549120..3686127fbc 100644 --- a/ext/oci8/tests/bind_sqltnum_11g.phpt +++ b/ext/oci8/tests/bind_sqltnum_11g.phpt @@ -16,7 +16,7 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "drop table bind_sqltnum_tab", + "drop table bind_sqltnum_tab", "create table bind_sqltnum_tab ( id number, @@ -165,14 +165,12 @@ check_col($c, 'number_t92', 50); // Clean up $stmtarray = array( - "drop table bind_sqltnum_tab" + "drop table bind_sqltnum_tab" ); oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 - baseline test array(2) { @@ -276,4 +274,3 @@ array(1) { array(0) { } } -===DONE=== diff --git a/ext/oci8/tests/bind_unsupported_1.phpt b/ext/oci8/tests/bind_unsupported_1.phpt index f8ae599c42..84ff5ca7db 100644 --- a/ext/oci8/tests/bind_unsupported_1.phpt +++ b/ext/oci8/tests/bind_unsupported_1.phpt @@ -31,8 +31,6 @@ foreach ($types as $t => $v) { } ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test - SQLT_AVC @@ -55,4 +53,3 @@ Warning: oci_bind_by_name(): Unknown or unsupported datatype given: 68 in %sbind Test - SQLT_ODT Warning: oci_bind_by_name(): Unknown or unsupported datatype given: 156 in %sbind_unsupported_1.php on line %d -===DONE=== diff --git a/ext/oci8/tests/bind_unsupported_2.phpt b/ext/oci8/tests/bind_unsupported_2.phpt index fefd57d148..e82154a6ad 100644 --- a/ext/oci8/tests/bind_unsupported_2.phpt +++ b/ext/oci8/tests/bind_unsupported_2.phpt @@ -24,8 +24,6 @@ foreach ($types as $t => $v) { } ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test - SQLT_BDOUBLE @@ -33,4 +31,3 @@ Warning: oci_bind_by_name(): Unknown or unsupported datatype given: 22 in %sbind Test - SQLT_BFLOAT Warning: oci_bind_by_name(): Unknown or unsupported datatype given: 21 in %sbind_unsupported_2.php on line %d -===DONE=== diff --git a/ext/oci8/tests/bind_unsupported_3.phpt b/ext/oci8/tests/bind_unsupported_3.phpt index 4fe9e0819c..27d1b20949 100644 --- a/ext/oci8/tests/bind_unsupported_3.phpt +++ b/ext/oci8/tests/bind_unsupported_3.phpt @@ -27,8 +27,6 @@ foreach ($types as $t => $v) { } ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test - SQLT_CLOB @@ -42,4 +40,3 @@ Warning: oci_bind_by_name(): Unable to find descriptor property in %sbind_unsupp Test - OCI_B_BLOB Warning: oci_bind_by_name(): Unable to find descriptor property in %sbind_unsupported_3.php on line %d -===DONE=== diff --git a/ext/oci8/tests/bug27303_1.phpt b/ext/oci8/tests/bug27303_1.phpt index 6310185b7f..a0e254a753 100644 --- a/ext/oci8/tests/bug27303_1.phpt +++ b/ext/oci8/tests/bug27303_1.phpt @@ -37,9 +37,9 @@ $r = OCIBindByName($stid, ':MYBV', $mybv); if (!$r) { echo "Bind error"; die; } for ($i = 1; $i < MYLIMIT; $i++) { - $r = OCIExecute($stid, OCI_DEFAULT); - if (!$r) { echo "Execute error"; die; } - var_dump($mybv); + $r = OCIExecute($stid, OCI_DEFAULT); + if (!$r) { echo "Execute error"; die; } + var_dump($mybv); } OCICommit($c); diff --git a/ext/oci8/tests/bug27303_1_11gR1.phpt b/ext/oci8/tests/bug27303_1_11gR1.phpt index 1c9296bef8..35495a81da 100644 --- a/ext/oci8/tests/bug27303_1_11gR1.phpt +++ b/ext/oci8/tests/bug27303_1_11gR1.phpt @@ -35,9 +35,9 @@ $r = OCIBindByName($stid, ':MYBV', $mybv); if (!$r) { echo "Bind error"; die; } for ($i = 1; $i < MYLIMIT; $i++) { - $r = OCIExecute($stid, OCI_DEFAULT); - if (!$r) { echo "Execute error"; die; } - var_dump($mybv); + $r = OCIExecute($stid, OCI_DEFAULT); + if (!$r) { echo "Execute error"; die; } + var_dump($mybv); } OCICommit($c); diff --git a/ext/oci8/tests/bug27303_2.phpt b/ext/oci8/tests/bug27303_2.phpt index 039f0e4acc..3674b72486 100644 --- a/ext/oci8/tests/bug27303_2.phpt +++ b/ext/oci8/tests/bug27303_2.phpt @@ -39,9 +39,9 @@ $r = OCIBindByName($stid, ':MYBV', $mybv); if (!$r) { echo "Bind error"; die; } for ($i = 1; $i < MYLIMIT; $i++) { - $r = OCIExecute($stid, OCI_DEFAULT); - if (!$r) { echo "Execute error"; die; } - var_dump($mybv); + $r = OCIExecute($stid, OCI_DEFAULT); + if (!$r) { echo "Execute error"; die; } + var_dump($mybv); } OCICommit($c); diff --git a/ext/oci8/tests/bug27303_2_11gR1.phpt b/ext/oci8/tests/bug27303_2_11gR1.phpt index 4c9a175edd..1abb66538a 100644 --- a/ext/oci8/tests/bug27303_2_11gR1.phpt +++ b/ext/oci8/tests/bug27303_2_11gR1.phpt @@ -39,9 +39,9 @@ $r = OCIBindByName($stid, ':MYBV', $mybv); if (!$r) { echo "Bind error"; die; } for ($i = 1; $i < MYLIMIT; $i++) { - $r = OCIExecute($stid, OCI_DEFAULT); - if (!$r) { echo "Execute error"; die; } - var_dump($mybv); + $r = OCIExecute($stid, OCI_DEFAULT); + if (!$r) { echo "Execute error"; die; } + var_dump($mybv); } OCICommit($c); diff --git a/ext/oci8/tests/bug27303_3.phpt b/ext/oci8/tests/bug27303_3.phpt index dfc85e08b7..347a1a93d9 100644 --- a/ext/oci8/tests/bug27303_3.phpt +++ b/ext/oci8/tests/bug27303_3.phpt @@ -14,8 +14,8 @@ $create_st[] = "create sequence myseq"; $create_st[] = "create table mytab (mydata varchar2(20), seqcol number)"; foreach ($create_st as $statement) { - $stmt = oci_parse($c, $statement); - @oci_execute($stmt); + $stmt = oci_parse($c, $statement); + @oci_execute($stmt); } define('MYLIMIT', 200); @@ -31,9 +31,9 @@ $r = OCIBindByName($stid, ':MYBV', $mybv, 5, SQLT_INT); if (!$r) { echo "Bind error"; die; } for ($i = 1; $i < MYLIMIT; $i++) { - $r = OCIExecute($stid, OCI_DEFAULT); - if (!$r) { echo "Execute error"; die; } - var_dump($mybv); + $r = OCIExecute($stid, OCI_DEFAULT); + if (!$r) { echo "Execute error"; die; } + var_dump($mybv); } OCICommit($c); @@ -43,8 +43,8 @@ $drop_st[] = "drop sequence myseq"; $drop_st[] = "drop table mytab"; foreach ($create_st as $statement) { - $stmt = oci_parse($c, $statement); - oci_execute($stmt); + $stmt = oci_parse($c, $statement); + oci_execute($stmt); } echo "Done\n"; diff --git a/ext/oci8/tests/bug27303_4.phpt b/ext/oci8/tests/bug27303_4.phpt index 5ee7090428..e51f3cdc75 100644 --- a/ext/oci8/tests/bug27303_4.phpt +++ b/ext/oci8/tests/bug27303_4.phpt @@ -36,9 +36,9 @@ $r = OCIBindByName($stid, ':MYBV', $mybv, 0 ); if (!$r) { echo "Bind error"; die; } for ($i = 1; $i < MYLIMIT; $i++) { - $r = OCIExecute($stid, OCI_DEFAULT); - if (!$r) { echo "Execute error"; die; } - var_dump($mybv); + $r = OCIExecute($stid, OCI_DEFAULT); + if (!$r) { echo "Execute error"; die; } + var_dump($mybv); } OCICommit($c); diff --git a/ext/oci8/tests/bug27303_4_11gR1.phpt b/ext/oci8/tests/bug27303_4_11gR1.phpt index 290f26d764..bd5e2571fc 100644 --- a/ext/oci8/tests/bug27303_4_11gR1.phpt +++ b/ext/oci8/tests/bug27303_4_11gR1.phpt @@ -34,9 +34,9 @@ $r = OCIBindByName($stid, ':MYBV', $mybv, 0 ); if (!$r) { echo "Bind error"; die; } for ($i = 1; $i < MYLIMIT; $i++) { - $r = OCIExecute($stid, OCI_DEFAULT); - if (!$r) { echo "Execute error"; die; } - var_dump($mybv); + $r = OCIExecute($stid, OCI_DEFAULT); + if (!$r) { echo "Execute error"; die; } + var_dump($mybv); } OCICommit($c); diff --git a/ext/oci8/tests/bug32325.phpt b/ext/oci8/tests/bug32325.phpt index 1dbe8cc6ce..3665f01edc 100644 --- a/ext/oci8/tests/bug32325.phpt +++ b/ext/oci8/tests/bug32325.phpt @@ -23,8 +23,8 @@ oci8_test_sql_execute($c, $stmtarray); $collection = oci_new_collection($c, "BUG32325_T"); $sql = "begin - select bug32325_t(1,2,3,4) into :list from dual; - end;"; + select bug32325_t(1,2,3,4) into :list from dual; + end;"; $stmt = oci_parse($c, $sql); diff --git a/ext/oci8/tests/bug36010.phpt b/ext/oci8/tests/bug36010.phpt index 83288dd355..0947d3f6fb 100644 --- a/ext/oci8/tests/bug36010.phpt +++ b/ext/oci8/tests/bug36010.phpt @@ -12,11 +12,11 @@ require __DIR__.'/connect.inc'; function f($conn) { - $sql = "begin :p_clob := 'lob string'; end;"; - $stid = oci_parse($conn, $sql); - $clob = oci_new_descriptor($conn, OCI_D_LOB); - oci_bind_by_name($stid, ":p_clob", $clob, -1, OCI_B_CLOB); - $r = oci_execute($stid, OCI_DEFAULT); + $sql = "begin :p_clob := 'lob string'; end;"; + $stid = oci_parse($conn, $sql); + $clob = oci_new_descriptor($conn, OCI_D_LOB); + oci_bind_by_name($stid, ":p_clob", $clob, -1, OCI_B_CLOB); + $r = oci_execute($stid, OCI_DEFAULT); } f($c); diff --git a/ext/oci8/tests/bug36096.phpt b/ext/oci8/tests/bug36096.phpt index 1cf5e9106c..eba558e08c 100644 --- a/ext/oci8/tests/bug36096.phpt +++ b/ext/oci8/tests/bug36096.phpt @@ -11,10 +11,10 @@ $sql = "SELECT 'ABC' FROM DUAL WHERE 1<>1"; $stmt = oci_parse($c, $sql); if(oci_execute($stmt, OCI_COMMIT_ON_SUCCESS)){ - var_dump(oci_fetch($stmt)); - var_dump(oci_result($stmt, 1)); - var_dump(oci_field_name($stmt, 1)); - var_dump(oci_field_type($stmt, 1)); + var_dump(oci_fetch($stmt)); + var_dump(oci_result($stmt, 1)); + var_dump(oci_field_name($stmt, 1)); + var_dump(oci_field_type($stmt, 1)); } echo "Done\n"; diff --git a/ext/oci8/tests/bug36403.phpt b/ext/oci8/tests/bug36403.phpt index 0f3b53b923..60819aa423 100644 --- a/ext/oci8/tests/bug36403.phpt +++ b/ext/oci8/tests/bug36403.phpt @@ -12,8 +12,8 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "drop table bug36403_tab", - "create table bug36403_tab (c1 number, col2 number, column3 number, col4 number)" + "drop table bug36403_tab", + "create table bug36403_tab (c1 number, col2 number, column3 number, col4 number)" ); oci8_test_sql_execute($c, $stmtarray); @@ -25,7 +25,7 @@ echo "Test 1\n"; $s = oci_parse($c, "select * from bug36403_tab"); oci_execute($s, OCI_DESCRIBE_ONLY); for ($i = oci_num_fields($s); $i > 0; $i--) { - echo oci_field_name($s, $i) . "\n"; + echo oci_field_name($s, $i) . "\n"; } echo "Test 2\n"; @@ -37,14 +37,12 @@ $row = oci_fetch_array($s); // Clean up $stmtarray = array( - "drop table bug36403_tab" + "drop table bug36403_tab" ); oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 COL4 @@ -54,4 +52,3 @@ C1 Test 2 Warning: oci_fetch_array(): ORA-%r(24338|01002)%r: %sbug36403.php on line %d -===DONE=== diff --git a/ext/oci8/tests/bug37220.phpt b/ext/oci8/tests/bug37220.phpt index 11ee2b23b6..ce0ac0a503 100644 --- a/ext/oci8/tests/bug37220.phpt +++ b/ext/oci8/tests/bug37220.phpt @@ -13,8 +13,8 @@ require __DIR__.'/connect.inc'; // Initialization $stmtarray = array( - "create table bug37220_tab( mycolumn xmltype not null)", - "insert into bug37220_tab values(xmltype('<THETAG myID=\"1234\"></THETAG>'))" + "create table bug37220_tab( mycolumn xmltype not null)", + "insert into bug37220_tab values(xmltype('<THETAG myID=\"1234\"></THETAG>'))" ); oci8_test_sql_execute($c, $stmtarray); @@ -24,8 +24,8 @@ oci8_test_sql_execute($c, $stmtarray); // bug37220_tab a normal Oracle table) $query = "UPDATE bug37220_tab - SET bug37220_tab.mycolumn = updateXML(bug37220_tab.mycolumn,'/THETAG',xmltype.createXML(:data)) - WHERE existsNode(bug37220_tab.mycolumn,'/THETAG[@myID=\"1234\"]') = 1"; + SET bug37220_tab.mycolumn = updateXML(bug37220_tab.mycolumn,'/THETAG',xmltype.createXML(:data)) + WHERE existsNode(bug37220_tab.mycolumn,'/THETAG[@myID=\"1234\"]') = 1"; $stmt = oci_parse ($c, $query); $clob = oci_new_descriptor($c, OCI_D_LOB); oci_bind_by_name($stmt, ':data', $clob, -1, OCI_B_CLOB); @@ -42,16 +42,16 @@ $stmt = oci_parse ($c, $query); oci_execute($stmt); while ($row = oci_fetch_array($stmt, OCI_ASSOC+OCI_RETURN_NULLS)) { - foreach ($row as $item) { - echo trim($item)."\n"; - } - echo "\n"; + foreach ($row as $item) { + echo trim($item)."\n"; + } + echo "\n"; } // Cleanup $stmtarray = array( - "drop table bug37220_tab" + "drop table bug37220_tab" ); oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/bug38173.phpt b/ext/oci8/tests/bug38173.phpt index 2d4cb7c33b..087e6a7485 100644 --- a/ext/oci8/tests/bug38173.phpt +++ b/ext/oci8/tests/bug38173.phpt @@ -26,15 +26,15 @@ oci_execute($s1); oci_execute($s2); for($i=0; $i < 5; $i++) { - $insert = "INSERT INTO t1 VALUES(".$i.")"; - $s = oci_parse($c, $insert); - oci_execute($s); + $insert = "INSERT INTO t1 VALUES(".$i.")"; + $s = oci_parse($c, $insert); + oci_execute($s); } for($i=0; $i < 5; $i++) { - $insert = "INSERT INTO t2 VALUES(".$i.")"; - $s = oci_parse($c, $insert); - oci_execute($s); + $insert = "INSERT INTO t2 VALUES(".$i.")"; + $s = oci_parse($c, $insert); + oci_execute($s); } $query =" diff --git a/ext/oci8/tests/bug41069.phpt b/ext/oci8/tests/bug41069.phpt index af322ba7d1..49d2905a4d 100644 --- a/ext/oci8/tests/bug41069.phpt +++ b/ext/oci8/tests/bug41069.phpt @@ -10,46 +10,46 @@ if ($test_drcp) die("skip DRCP does not support shared database links"); --INI-- oci8.default_prefetch=5 --FILE-- - <?php + <?php - require(__DIR__.'/connect.inc'); + require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "alter session set nls_date_format = 'MM/DD/YYYY'", + "alter session set nls_date_format = 'MM/DD/YYYY'", - "drop database link bug41069_dblink", + "drop database link bug41069_dblink", - "drop table bug41069_tab", + "drop table bug41069_tab", - "create shared database link bug41069_dblink authenticated by $user identified by $password using '$dbase'", + "create shared database link bug41069_dblink authenticated by $user identified by $password using '$dbase'", - "create table bug41069_tab - ( - c1 number(20), - c2 varchar2(60 byte), - c3 varchar2(1000 byte), - c4 varchar2(255 byte), - c5 varchar2(2 byte), - c6 varchar2(1 byte), - c7 varchar2(255 byte), - c8 varchar2(50 byte), - c9 date, - c10 date, - c12 number(20), - c13 varchar2(20 byte), - c15 varchar2(50 byte) - )", + "create table bug41069_tab + ( + c1 number(20), + c2 varchar2(60 byte), + c3 varchar2(1000 byte), + c4 varchar2(255 byte), + c5 varchar2(2 byte), + c6 varchar2(1 byte), + c7 varchar2(255 byte), + c8 varchar2(50 byte), + c9 date, + c10 date, + c12 number(20), + c13 varchar2(20 byte), + c15 varchar2(50 byte) + )", - "insert into bug41069_tab (c1, c2, c5, c6, c9, c10, c12, c15) values - (111, 'aaaaaaa', 'b', 'c', '01/17/2008', '01/07/2017', 2222, 'zzzzzzzzzz')", + "insert into bug41069_tab (c1, c2, c5, c6, c9, c10, c12, c15) values + (111, 'aaaaaaa', 'b', 'c', '01/17/2008', '01/07/2017', 2222, 'zzzzzzzzzz')", - "insert into bug41069_tab (c1, c2, c3, c4, c5, c6, c7, c9, c10, c12, c13, c15) values - (112, 'aaaaaaa', 'bbbbbbbb', 'ccccccc', 'd', 'e', 'rrrrrrr', '04/16/2007', '04/16/2007', 2223, 'xxxxxxxx', 'zzzzzzzz')", + "insert into bug41069_tab (c1, c2, c3, c4, c5, c6, c7, c9, c10, c12, c13, c15) values + (112, 'aaaaaaa', 'bbbbbbbb', 'ccccccc', 'd', 'e', 'rrrrrrr', '04/16/2007', '04/16/2007', 2223, 'xxxxxxxx', 'zzzzzzzz')", - "insert into bug41069_tab (c1, c2, c3, c4, c5, c6, c7, c9, c10, c12, c15) values - (113, 'aaaaaaa', 'bbbbbbbbbb', 'cccccc', 'e', 'f', 'dddd', '12/04/2006', '12/04/2006', 2224, 'zzzzzzz')" + "insert into bug41069_tab (c1, c2, c3, c4, c5, c6, c7, c9, c10, c12, c15) values + (113, 'aaaaaaa', 'bbbbbbbbbb', 'cccccc', 'e', 'f', 'dddd', '12/04/2006', '12/04/2006', 2224, 'zzzzzzz')" ); oci8_test_sql_execute($c, $stmtarray); @@ -74,8 +74,8 @@ var_dump($results); $c = oci_new_connect($user, $password, $dbase); $stmtarray = array( - "drop database link bug41069_dblink", - "drop table bug41069_tab" + "drop database link bug41069_dblink", + "drop table bug41069_tab" ); oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/bug42134.phpt b/ext/oci8/tests/bug42134.phpt index d1e0b97c84..13273cff8f 100644 --- a/ext/oci8/tests/bug42134.phpt +++ b/ext/oci8/tests/bug42134.phpt @@ -13,49 +13,49 @@ require(__DIR__.'/details.inc'); // Test collection creation error for normal connection if (!empty($dbase)) { - $c = oci_connect($user,$password,$dbase); + $c = oci_connect($user,$password,$dbase); } else { - $c = oci_connect($user,$password); + $c = oci_connect($user,$password); } $collection = oci_new_collection($c, "ABC"); if (!$collection) { - echo "Normal connection: New Collection error\n"; - $m = oci_error($c); - var_dump($m); + echo "Normal connection: New Collection error\n"; + $m = oci_error($c); + var_dump($m); } // Test collection creation error for new connection if (!empty($dbase)) { - $c = oci_new_connect($user,$password,$dbase); + $c = oci_new_connect($user,$password,$dbase); } else { - $c = oci_new_connect($user,$password); + $c = oci_new_connect($user,$password); } $collection = oci_new_collection($c, "DEF"); if (!$collection) { - echo "New connection: New Collection error\n"; - $m = oci_error($c); - var_dump($m); + echo "New connection: New Collection error\n"; + $m = oci_error($c); + var_dump($m); } // Test collection creation error for persistent connection if (!empty($dbase)) { - $c = oci_pconnect($user,$password,$dbase); + $c = oci_pconnect($user,$password,$dbase); } else { - $c = oci_pconnect($user,$password); + $c = oci_pconnect($user,$password); } $collection = oci_new_collection($c, "GHI"); if (!$collection) { - echo "Persistent connection: New Collection error\n"; - $m = oci_error($c); - var_dump($m); + echo "Persistent connection: New Collection error\n"; + $m = oci_error($c); + var_dump($m); } echo "Done\n"; diff --git a/ext/oci8/tests/bug42173.phpt b/ext/oci8/tests/bug42173.phpt index 33e1adaae4..9c6b4996e2 100644 --- a/ext/oci8/tests/bug42173.phpt +++ b/ext/oci8/tests/bug42173.phpt @@ -38,8 +38,8 @@ interval'1 2:20:20.123' day to second, interval'1 2:20:20.12345' day to second)"); foreach ($stmts as $sql) { - $s = oci_parse($c, $sql); - $r = @oci_execute($s); + $s = oci_parse($c, $sql); + $r = @oci_execute($s); } $s = oci_parse($c, "select * from ts_test"); @@ -48,14 +48,14 @@ $row = oci_fetch_array($s, OCI_ASSOC); var_dump($row); foreach ($row as $name => $field) { - echo "\nColumn $name\n"; - var_dump(oci_field_is_null($s, $name)); - var_dump(oci_field_name($s, $name)); - var_dump(oci_field_type($s, $name)); - var_dump(oci_field_type_raw($s, $name)); - var_dump(oci_field_scale($s, $name)); - var_dump(oci_field_precision($s, $name)); - var_dump(oci_field_size($s, $name)); + echo "\nColumn $name\n"; + var_dump(oci_field_is_null($s, $name)); + var_dump(oci_field_name($s, $name)); + var_dump(oci_field_type($s, $name)); + var_dump(oci_field_type_raw($s, $name)); + var_dump(oci_field_scale($s, $name)); + var_dump(oci_field_precision($s, $name)); + var_dump(oci_field_size($s, $name)); } // Cleanup diff --git a/ext/oci8/tests/bug42496_1.phpt b/ext/oci8/tests/bug42496_1.phpt index b3d6cf0203..9db7d720e9 100644 --- a/ext/oci8/tests/bug42496_1.phpt +++ b/ext/oci8/tests/bug42496_1.phpt @@ -14,11 +14,11 @@ require __DIR__.'/connect.inc'; // Initialization $stmtarray = array( - "DROP table bug42496_1_tab", - "CREATE table bug42496_1_tab(c1 CLOB, c2 CLOB)", - "INSERT INTO bug42496_1_tab VALUES('test1', 'test1')", - "INSERT INTO bug42496_1_tab VALUES('test2', 'test2')", - "INSERT INTO bug42496_1_tab VALUES('test3', 'test3')" + "DROP table bug42496_1_tab", + "CREATE table bug42496_1_tab(c1 CLOB, c2 CLOB)", + "INSERT INTO bug42496_1_tab VALUES('test1', 'test1')", + "INSERT INTO bug42496_1_tab VALUES('test2', 'test2')", + "INSERT INTO bug42496_1_tab VALUES('test3', 'test3')" ); oci8_test_sql_execute($c, $stmtarray); @@ -28,17 +28,17 @@ oci8_test_sql_execute($c, $stmtarray); echo "Test 1\n"; for ($i = 0; $i < 15000; $i++) { - $s = oci_parse($c, "SELECT * from bug42496_1_tab"); - oci_define_by_name($s, "C1", $col1); - oci_define_by_name($s, "C2", $col2); - if (oci_execute($s)) { - $arr = array(); - while ($arr = oci_fetch_assoc($s)) { - $arr['C1']->free(); - $arr['C2']->free(); - } - } - oci_free_statement($s); + $s = oci_parse($c, "SELECT * from bug42496_1_tab"); + oci_define_by_name($s, "C1", $col1); + oci_define_by_name($s, "C2", $col2); + if (oci_execute($s)) { + $arr = array(); + while ($arr = oci_fetch_assoc($s)) { + $arr['C1']->free(); + $arr['C2']->free(); + } + } + oci_free_statement($s); } echo "Done\n"; @@ -46,7 +46,7 @@ echo "Done\n"; // Cleanup $stmtarray = array( - "DROP table bug42496_1_tab" + "DROP table bug42496_1_tab" ); oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/bug42496_2.phpt b/ext/oci8/tests/bug42496_2.phpt index bcb4076601..52c42f8bcf 100644 --- a/ext/oci8/tests/bug42496_2.phpt +++ b/ext/oci8/tests/bug42496_2.phpt @@ -14,11 +14,11 @@ require __DIR__.'/connect.inc'; // Initialization $stmtarray = array( - "DROP table bug42496_2_tab", - "CREATE table bug42496_2_tab(c1 CLOB, c2 CLOB)", - "INSERT INTO bug42496_2_tab VALUES('test1', 'test1')", - "INSERT INTO bug42496_2_tab VALUES('test2', 'test2')", - "INSERT INTO bug42496_2_tab VALUES('test3', 'test3')" + "DROP table bug42496_2_tab", + "CREATE table bug42496_2_tab(c1 CLOB, c2 CLOB)", + "INSERT INTO bug42496_2_tab VALUES('test1', 'test1')", + "INSERT INTO bug42496_2_tab VALUES('test2', 'test2')", + "INSERT INTO bug42496_2_tab VALUES('test3', 'test3')" ); oci8_test_sql_execute($c, $stmtarray); @@ -28,15 +28,15 @@ oci8_test_sql_execute($c, $stmtarray); echo "Test 2\n"; for ($i = 0; $i < 15000; $i++) { - $s = oci_parse($c, "SELECT * from bug42496_2_tab"); - if (oci_execute($s)) { - $arr = array(); - while ($arr = oci_fetch_assoc($s)) { - $arr['C1']->free(); - $arr['C2']->free(); - } - } - oci_free_statement($s); + $s = oci_parse($c, "SELECT * from bug42496_2_tab"); + if (oci_execute($s)) { + $arr = array(); + while ($arr = oci_fetch_assoc($s)) { + $arr['C1']->free(); + $arr['C2']->free(); + } + } + oci_free_statement($s); } echo "Done\n"; @@ -44,7 +44,7 @@ echo "Done\n"; // Cleanup $stmtarray = array( - "DROP table bug42496_2_tab" + "DROP table bug42496_2_tab" ); oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/bug43497.phpt b/ext/oci8/tests/bug43497.phpt index 29ff9e6a5c..45325f6b44 100644 --- a/ext/oci8/tests/bug43497.phpt +++ b/ext/oci8/tests/bug43497.phpt @@ -18,8 +18,8 @@ function sessionid($c) // determines and returns current session ID $stmt = oci_parse($c, $query); if (oci_execute($stmt, OCI_DEFAULT)) { - $row = oci_fetch($stmt); - return oci_result($stmt, 1); + $row = oci_fetch($stmt); + return oci_result($stmt, 1); } return null; @@ -33,10 +33,10 @@ function templobs($c, $sid) // returns number of temporary LOBs $stmt = oci_parse($c, $query); if (oci_execute($stmt, OCI_DEFAULT)) { - $row = oci_fetch($stmt); - $val = oci_result($stmt, 1); - oci_free_statement($stmt); - return $val; + $row = oci_fetch($stmt); + $val = oci_result($stmt, 1); + oci_free_statement($stmt); + return $val; } return null; } @@ -47,14 +47,14 @@ function readxmltab_ex($c) { $stmt = oci_parse($c, "select extract(xml, '/').getclobval() from bug43497_tab"); - $cntchk = 0; - if (oci_execute($stmt)) { - while ($result = oci_fetch_array($stmt, OCI_NUM)) { - $result[0]->free(); // cleanup properly - ++$cntchk; - } - } - echo "Loop count check = $cntchk\n"; + $cntchk = 0; + if (oci_execute($stmt)) { + while ($result = oci_fetch_array($stmt, OCI_NUM)) { + $result[0]->free(); // cleanup properly + ++$cntchk; + } + } + echo "Loop count check = $cntchk\n"; } // Read all XML data using explicit LOB locator but without freeing the temp lobs @@ -62,13 +62,13 @@ function readxmltab_ex_nofree($c) { $stmt = oci_parse($c, "select extract(xml, '/').getclobval() from bug43497_tab"); - $cntchk = 0; - if (oci_execute($stmt)) { - while ($result = oci_fetch_array($stmt, OCI_NUM)) { - ++$cntchk; - } - } - echo "Loop count check = $cntchk\n"; + $cntchk = 0; + if (oci_execute($stmt)) { + while ($result = oci_fetch_array($stmt, OCI_NUM)) { + ++$cntchk; + } + } + echo "Loop count check = $cntchk\n"; } // Read all XML data using implicit LOB locator @@ -76,18 +76,18 @@ function readxmltab_im($c) { $stmt = oci_parse($c, "select extract(xml, '/').getclobval() from bug43497_tab"); - $cntchk = 0; - if (oci_execute($stmt)) { - while ($result = oci_fetch_array($stmt, OCI_NUM+OCI_RETURN_LOBS)) { - ++$cntchk; - } - } - echo "Loop count check = $cntchk\n"; + $cntchk = 0; + if (oci_execute($stmt)) { + while ($result = oci_fetch_array($stmt, OCI_NUM+OCI_RETURN_LOBS)) { + ++$cntchk; + } + } + echo "Loop count check = $cntchk\n"; } function createxmltab($c) // create table w/ field of XML type { - @dropxmltab($c); + @dropxmltab($c); $stmt = oci_parse($c, "create table bug43497_tab (id number primary key, xml xmltype)"); oci_execute($stmt); } @@ -101,31 +101,31 @@ function dropxmltab($c) // delete table function fillxmltab($c) { - for ($id = 1; $id <= 100; $id++) { - - // create an XML element string with random data - $s = "<data>"; - for ($j = 0; $j < 128; $j++) { - $s .= rand(); - } - $s .= "</data>\n"; - for ($j = 0; $j < 4; $j++) { - $s .= $s; - } - $data = "<?xml version=\"1.0\"?><records>" . $s . "</records>"; - - // insert XML data into database - - $stmt = oci_parse($c, "insert into bug43497_tab(id, xml) values (:id, sys.xmltype.createxml(:xml))"); - oci_bind_by_name($stmt, ":id", $id); - $clob = oci_new_descriptor($c, OCI_D_LOB); - oci_bind_by_name($stmt, ":xml", $clob, -1, OCI_B_CLOB); - $clob->writetemporary($data); - oci_execute($stmt); - - $clob->close(); - $clob->free(); - } + for ($id = 1; $id <= 100; $id++) { + + // create an XML element string with random data + $s = "<data>"; + for ($j = 0; $j < 128; $j++) { + $s .= rand(); + } + $s .= "</data>\n"; + for ($j = 0; $j < 4; $j++) { + $s .= $s; + } + $data = "<?xml version=\"1.0\"?><records>" . $s . "</records>"; + + // insert XML data into database + + $stmt = oci_parse($c, "insert into bug43497_tab(id, xml) values (:id, sys.xmltype.createxml(:xml))"); + oci_bind_by_name($stmt, ":id", $id); + $clob = oci_new_descriptor($c, OCI_D_LOB); + oci_bind_by_name($stmt, ":xml", $clob, -1, OCI_B_CLOB); + $clob->writetemporary($data); + oci_execute($stmt); + + $clob->close(); + $clob->free(); + } } diff --git a/ext/oci8/tests/bug44008.phpt b/ext/oci8/tests/bug44008.phpt index 0b031aef90..faf26f472e 100644 --- a/ext/oci8/tests/bug44008.phpt +++ b/ext/oci8/tests/bug44008.phpt @@ -13,9 +13,9 @@ require __DIR__.'/connect.inc'; // Initialization $stmtarray = array( - "create or replace procedure bug44008_proc (p in out clob) - as begin p := 'A'; - end;" + "create or replace procedure bug44008_proc (p in out clob) + as begin p := 'A'; + end;" ); oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/bug44113.phpt b/ext/oci8/tests/bug44113.phpt index 8a48d6aff0..ca2a03e914 100644 --- a/ext/oci8/tests/bug44113.phpt +++ b/ext/oci8/tests/bug44113.phpt @@ -14,20 +14,20 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "create or replace type bug44113_list_t as table of number" + "create or replace type bug44113_list_t as table of number" ); oci8_test_sql_execute($c, $stmtarray); // Run Test // The test can take some time to complete and can exceed PHP's test -// timout limit on slow networks. +// timeout limit on slow networks. for ($x = 0; $x < 70000; $x++) { - if (!($var = oci_new_collection($c, 'BUG44113_LIST_T'))) { - print "Failed new collection creation on $x\n"; - break; - } + if (!($var = oci_new_collection($c, 'BUG44113_LIST_T'))) { + print "Failed new collection creation on $x\n"; + break; + } } print "Completed $x\n"; @@ -35,7 +35,7 @@ print "Completed $x\n"; // Cleanup $stmtarray = array( - "drop type bug44113_list_t" + "drop type bug44113_list_t" ); oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/bug44206.phpt b/ext/oci8/tests/bug44206.phpt index 069a840423..2b051771e2 100644 --- a/ext/oci8/tests/bug44206.phpt +++ b/ext/oci8/tests/bug44206.phpt @@ -14,24 +14,24 @@ require __DIR__.'/connect.inc'; for ($x = 0; $x < 400; $x++) { - $stmt = "select cursor (select $x from dual) a, - cursor (select $x from dual) b - from dual"; - $s = oci_parse($c, $stmt); - $r = oci_execute($s); + $stmt = "select cursor (select $x from dual) a, + cursor (select $x from dual) b + from dual"; + $s = oci_parse($c, $stmt); + $r = oci_execute($s); if (!$r) { echo "Exiting $x\n"; exit; } - $mode = OCI_ASSOC | OCI_RETURN_NULLS; - $result = oci_fetch_array($s, $mode); - oci_execute($result['A']); - oci_execute($result['B']); - oci_fetch_array($result['A'], $mode); - oci_fetch_array($result['B'], $mode); - oci_free_statement($result['A']); - oci_free_statement($result['B']); - oci_free_statement($s); + $mode = OCI_ASSOC | OCI_RETURN_NULLS; + $result = oci_fetch_array($s, $mode); + oci_execute($result['A']); + oci_execute($result['B']); + oci_fetch_array($result['A'], $mode); + oci_fetch_array($result['B'], $mode); + oci_free_statement($result['A']); + oci_free_statement($result['B']); + oci_free_statement($s); } echo "Completed $x\n"; diff --git a/ext/oci8/tests/bug45458.phpt b/ext/oci8/tests/bug45458.phpt index 3a4b514857..3e2652642c 100644 --- a/ext/oci8/tests/bug45458.phpt +++ b/ext/oci8/tests/bug45458.phpt @@ -37,8 +37,6 @@ oci_free_statement($s); oci_close($c); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 array(1) { @@ -81,4 +79,3 @@ array(1) { } string(1) "X" string(1) "X" -===DONE=== diff --git a/ext/oci8/tests/bug46994.phpt b/ext/oci8/tests/bug46994.phpt index 079f5df6c4..ace65b8bd2 100644 --- a/ext/oci8/tests/bug46994.phpt +++ b/ext/oci8/tests/bug46994.phpt @@ -13,15 +13,15 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "create or replace procedure bug46994_proc1(p1 in out nocopy clob) is - begin - dbms_lob.trim(p1, 0); - dbms_lob.writeappend(p1, 26, 'This should be the output.'); + "create or replace procedure bug46994_proc1(p1 in out nocopy clob) is + begin + dbms_lob.trim(p1, 0); + dbms_lob.writeappend(p1, 26, 'This should be the output.'); end bug46994_proc1;", - "create or replace procedure bug46994_proc2(p1 in out nocopy clob) is - begin - dbms_lob.trim(p1, 0); - dbms_lob.writeappend(p1, 37, 'The output should be even longer now.'); + "create or replace procedure bug46994_proc2(p1 in out nocopy clob) is + begin + dbms_lob.trim(p1, 0); + dbms_lob.writeappend(p1, 37, 'The output should be even longer now.'); end bug46994_proc2;" ); @@ -60,8 +60,8 @@ var_dump($myclob->load()); // Use cached size code path // Cleanup $stmtarray = array( - "drop procedure bug46994_proc1", - "drop procedure bug46994_proc2" + "drop procedure bug46994_proc1", + "drop procedure bug46994_proc2" ); oci8_test_sql_execute($c, $stmtarray); @@ -69,8 +69,6 @@ oci8_test_sql_execute($c, $stmtarray); oci_close($c); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 string(26) "This should be the output." @@ -80,4 +78,3 @@ Test 3 string(26) "This should be the output." Test 4 string(26) "This should be the output." -===DONE=== diff --git a/ext/oci8/tests/bug47189.phpt b/ext/oci8/tests/bug47189.phpt index a5b5217ac5..96aec54722 100644 --- a/ext/oci8/tests/bug47189.phpt +++ b/ext/oci8/tests/bug47189.phpt @@ -29,8 +29,6 @@ oci_fetch_all($s, $rs1, 0, 1, OCI_FETCHSTATEMENT_BY_ROW); var_dump($rs1); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 array(1) { @@ -54,4 +52,3 @@ array(1) { Warning: oci_fetch_all(): ORA-01002: %s in %s on line %d array(0) { } -===DONE=== diff --git a/ext/oci8/tests/bug47281.phpt b/ext/oci8/tests/bug47281.phpt index 01b273129c..377141e3cc 100644 --- a/ext/oci8/tests/bug47281.phpt +++ b/ext/oci8/tests/bug47281.phpt @@ -57,11 +57,8 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 ORA-20000: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaBcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccDeeeeeeeeeeee Test 2 oci_execute(): ORA-20000: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaBcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccDeeeeeeeeeeee -===DONE=== diff --git a/ext/oci8/tests/bug47281_tt.phpt b/ext/oci8/tests/bug47281_tt.phpt index acb1eef55e..f0e6d0200d 100644 --- a/ext/oci8/tests/bug47281_tt.phpt +++ b/ext/oci8/tests/bug47281_tt.phpt @@ -49,11 +49,8 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 ORA-57000: TT8507: ORA-20000: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa Test 2 oci_execute(): ORA-57000: TT8507: ORA-20000: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -===DONE=== diff --git a/ext/oci8/tests/bug51291_1.phpt b/ext/oci8/tests/bug51291_1.phpt index 406d9b5dcd..fcb41dd7c9 100644 --- a/ext/oci8/tests/bug51291_1.phpt +++ b/ext/oci8/tests/bug51291_1.phpt @@ -139,8 +139,6 @@ if (!$r) { } ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 - Parse array(4) { @@ -167,7 +165,7 @@ array(4) { Test 2 - Parse -Warning: oci_error() expects parameter 1 to be resource, bool%sgiven in %sbug51291_1.php on line %d +Warning: oci_error(): Argument #1 must be of type resource, bool%sgiven in %sbug51291_1.php on line %d bool(false) array(4) { ["code"]=> @@ -182,7 +180,7 @@ array(4) { NULL 2nd call -Warning: oci_error() expects parameter 1 to be resource, bool%sgiven in %sbug51291_1.php on line %d +Warning: oci_error(): Argument #1 must be of type resource, bool%sgiven in %sbug51291_1.php on line %d bool(false) array(4) { ["code"]=> @@ -391,4 +389,3 @@ array(4) { ["sqltext"]=> string(30) "select reallynothere from dual" } -===DONE=== diff --git a/ext/oci8/tests/bug51291_2.phpt b/ext/oci8/tests/bug51291_2.phpt index c39eefbbdc..56655283fa 100644 --- a/ext/oci8/tests/bug51291_2.phpt +++ b/ext/oci8/tests/bug51291_2.phpt @@ -31,8 +31,6 @@ if (!$r) { } ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 - Execute - after successful 2nd query with same statement bool(false) @@ -53,4 +51,3 @@ Execute status is true bool(false) bool(false) bool(false) -===DONE=== diff --git a/ext/oci8/tests/bug68298.phpt b/ext/oci8/tests/bug68298.phpt index ed15b84997..f0fc201bb5 100644 --- a/ext/oci8/tests/bug68298.phpt +++ b/ext/oci8/tests/bug68298.phpt @@ -11,8 +11,8 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only"); require(__DIR__.'/connect.inc'); $stmtarray = array( - "DROP TABLE BUG68298", - "CREATE TABLE BUG68298 (COL1 NUMBER(20))" + "DROP TABLE BUG68298", + "CREATE TABLE BUG68298 (COL1 NUMBER(20))" ); oci8_test_sql_execute($c, $stmtarray); @@ -36,8 +36,6 @@ var_dump($r); $stmtarray = array("DROP TABLE BUG68298"); oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- array(1) { ["COL1"]=> @@ -48,4 +46,3 @@ array(1) { string(20) "-1152921504606846975" } } -===DONE=== diff --git a/ext/oci8/tests/bug71148.phpt b/ext/oci8/tests/bug71148.phpt index 838dbc4fbb..60fac0d3ae 100644 --- a/ext/oci8/tests/bug71148.phpt +++ b/ext/oci8/tests/bug71148.phpt @@ -157,8 +157,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1: Bind input parameter in a local function array(2) { @@ -188,4 +186,3 @@ Test 6: Bind IN OUT parameter within the same scope of execute string(4) "STR1" string(4) "STR2" string(9) "STR1 STR2" -===DONE=== diff --git a/ext/oci8/tests/bug71422.phpt b/ext/oci8/tests/bug71422.phpt index 6896c5de0d..798981ed0b 100644 --- a/ext/oci8/tests/bug71422.phpt +++ b/ext/oci8/tests/bug71422.phpt @@ -10,9 +10,9 @@ if (!extension_loaded('oci8')) die ("skip no oci8 extension"); require(__DIR__.'/connect.inc'); $stmtarray = array( - "DROP TABLE BUG71422_TEST", - "CREATE TABLE BUG71422_TEST (TEST_ID NUMBER(*,0) NOT NULL, LABEL VARCHAR2(50 CHAR), CONSTRAINT BUG71422_TEST_PK PRIMARY KEY (TEST_ID))", - "INSERT INTO BUG71422_TEST (TEST_ID, LABEL) VALUES (1, 'Foo')" + "DROP TABLE BUG71422_TEST", + "CREATE TABLE BUG71422_TEST (TEST_ID NUMBER(*,0) NOT NULL, LABEL VARCHAR2(50 CHAR), CONSTRAINT BUG71422_TEST_PK PRIMARY KEY (TEST_ID))", + "INSERT INTO BUG71422_TEST (TEST_ID, LABEL) VALUES (1, 'Foo')" ); oci8_test_sql_execute($c, $stmtarray); @@ -20,7 +20,7 @@ oci8_test_sql_execute($c, $stmtarray); $stmt = oci_parse($c, 'SELECT LABEL AS RAW_QUERY FROM BUG71422_TEST WHERE TEST_ID=1'); oci_execute($stmt); while ($row = oci_fetch_array($stmt, OCI_ASSOC+OCI_RETURN_NULLS)) { - var_dump($row); + var_dump($row); } $stmt = oci_parse($c, 'SELECT LABEL AS NUMERIC_BIND_PARAMETER FROM BUG71422_TEST WHERE TEST_ID=:test_id'); @@ -28,7 +28,7 @@ $value = 1; oci_bind_by_name($stmt, ':test_id', $value, -1, SQLT_INT); oci_execute($stmt); while ($row = oci_fetch_array($stmt, OCI_ASSOC+OCI_RETURN_NULLS)) { - var_dump($row); + var_dump($row); } $stmt = oci_parse($c, 'SELECT LABEL AS STRING_BIND_PARAMETER FROM BUG71422_TEST WHERE TEST_ID=:test_id'); @@ -36,19 +36,17 @@ $value = 1; oci_bind_by_name($stmt, ':test_id', $value, -1, SQLT_CHR); oci_execute($stmt); while ($row = oci_fetch_array($stmt, OCI_ASSOC+OCI_RETURN_NULLS)) { - var_dump($row); + var_dump($row); } // Cleanup $stmtarray = array( - "DROP TABLE BUG71422_TEST" + "DROP TABLE BUG71422_TEST" ); oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- array(1) { ["RAW_QUERY"]=> @@ -62,4 +60,3 @@ array(1) { ["STRING_BIND_PARAMETER"]=> string(3) "Foo" } -===DONE=== diff --git a/ext/oci8/tests/bug71600.phpt b/ext/oci8/tests/bug71600.phpt index 9cf9f2e971..718d653445 100644 --- a/ext/oci8/tests/bug71600.phpt +++ b/ext/oci8/tests/bug71600.phpt @@ -78,8 +78,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 Executing SELECT statament... @@ -93,4 +91,3 @@ Fetching data by rows... 2 Records Found 0|1|9 1|11|19 -===DONE=== diff --git a/ext/oci8/tests/bug72524.phpt b/ext/oci8/tests/bug72524.phpt index f696277f86..9159c75cac 100644 --- a/ext/oci8/tests/bug72524.phpt +++ b/ext/oci8/tests/bug72524.phpt @@ -75,8 +75,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 - P1 Value: NULL P1 Length: Default P1 Type: Default P2 Value: NULL P2 Length: Default P2 Type: Default bool(true) @@ -92,4 +90,3 @@ Test 5 - P1 Value: NULL P1 Length: 0 P1 Type: SQLT_LNG P2 Value: NULL P2 Warning: oci_execute(): ORA-24816: %s in %s on line %d bool(false) -===DONE=== diff --git a/ext/oci8/tests/bug74625.phpt b/ext/oci8/tests/bug74625.phpt index 9bcaf29788..7effbb7f76 100644 --- a/ext/oci8/tests/bug74625.phpt +++ b/ext/oci8/tests/bug74625.phpt @@ -47,8 +47,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- array(5) { [0]=> @@ -62,4 +60,3 @@ array(5) { [4]=> int(-10) } -===DONE=== diff --git a/ext/oci8/tests/calltimeout1.phpt b/ext/oci8/tests/calltimeout1.phpt index 123e51561a..865fd62b68 100644 --- a/ext/oci8/tests/calltimeout1.phpt +++ b/ext/oci8/tests/calltimeout1.phpt @@ -43,9 +43,6 @@ oci_set_call_timeout($c, 4000); // milliseconds $r = mysleep($c, 8); // seconds ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 Execute error was ORA-03136: %s -===DONE=== diff --git a/ext/oci8/tests/clientversion.phpt b/ext/oci8/tests/clientversion.phpt index 262ded462f..e31ccc1ac8 100644 --- a/ext/oci8/tests/clientversion.phpt +++ b/ext/oci8/tests/clientversion.phpt @@ -10,8 +10,5 @@ if (!extension_loaded('oci8')) die("skip no oci8 extension"); echo oci_client_version(), "\n"; ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- %d.%d.%d.%d.%d -===DONE=== diff --git a/ext/oci8/tests/coll_009.phpt b/ext/oci8/tests/coll_009.phpt index e55a4a210c..2707fbccf7 100644 --- a/ext/oci8/tests/coll_009.phpt +++ b/ext/oci8/tests/coll_009.phpt @@ -11,8 +11,8 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE - ".$type_name." - "; + ".$type_name." + "; $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); diff --git a/ext/oci8/tests/coll_009_func.phpt b/ext/oci8/tests/coll_009_func.phpt index fca04599e2..5b3e08579a 100644 --- a/ext/oci8/tests/coll_009_func.phpt +++ b/ext/oci8/tests/coll_009_func.phpt @@ -11,8 +11,8 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE - ".$type_name." - "; + ".$type_name." + "; $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); diff --git a/ext/oci8/tests/coll_010.phpt b/ext/oci8/tests/coll_010.phpt index 33e1b6fd18..42bd788a81 100644 --- a/ext/oci8/tests/coll_010.phpt +++ b/ext/oci8/tests/coll_010.phpt @@ -11,8 +11,8 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE - ".$type_name." - "; + ".$type_name." + "; $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); diff --git a/ext/oci8/tests/coll_010_func.phpt b/ext/oci8/tests/coll_010_func.phpt index 2f67283538..9ef6c22250 100644 --- a/ext/oci8/tests/coll_010_func.phpt +++ b/ext/oci8/tests/coll_010_func.phpt @@ -11,8 +11,8 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE - ".$type_name." - "; + ".$type_name." + "; $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); diff --git a/ext/oci8/tests/coll_011.phpt b/ext/oci8/tests/coll_011.phpt index 13c4613b00..562de0889f 100644 --- a/ext/oci8/tests/coll_011.phpt +++ b/ext/oci8/tests/coll_011.phpt @@ -11,8 +11,8 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE - ".$type_name." - "; + ".$type_name." + "; $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); diff --git a/ext/oci8/tests/coll_011_func.phpt b/ext/oci8/tests/coll_011_func.phpt index bc6bd6ea73..ca43336ffc 100644 --- a/ext/oci8/tests/coll_011_func.phpt +++ b/ext/oci8/tests/coll_011_func.phpt @@ -11,8 +11,8 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE - ".$type_name." - "; + ".$type_name." + "; $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); diff --git a/ext/oci8/tests/coll_012.phpt b/ext/oci8/tests/coll_012.phpt index 615a3aad7a..be0439e8ba 100644 --- a/ext/oci8/tests/coll_012.phpt +++ b/ext/oci8/tests/coll_012.phpt @@ -11,8 +11,8 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE - ".$type_name." - "; + ".$type_name." + "; $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); diff --git a/ext/oci8/tests/coll_012_func.phpt b/ext/oci8/tests/coll_012_func.phpt index 41a7084109..fa6a026d16 100644 --- a/ext/oci8/tests/coll_012_func.phpt +++ b/ext/oci8/tests/coll_012_func.phpt @@ -11,8 +11,8 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE - ".$type_name." - "; + ".$type_name." + "; $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); diff --git a/ext/oci8/tests/coll_013.phpt b/ext/oci8/tests/coll_013.phpt index ef3af0a8e7..1e943bf57e 100644 --- a/ext/oci8/tests/coll_013.phpt +++ b/ext/oci8/tests/coll_013.phpt @@ -11,8 +11,8 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE - ".$type_name." - "; + ".$type_name." + "; $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); diff --git a/ext/oci8/tests/coll_013_func.phpt b/ext/oci8/tests/coll_013_func.phpt index bb6d7083e3..417bfdb18f 100644 --- a/ext/oci8/tests/coll_013_func.phpt +++ b/ext/oci8/tests/coll_013_func.phpt @@ -11,8 +11,8 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE - ".$type_name." - "; + ".$type_name." + "; $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); diff --git a/ext/oci8/tests/coll_014.phpt b/ext/oci8/tests/coll_014.phpt index 0af0ead329..697d306818 100644 --- a/ext/oci8/tests/coll_014.phpt +++ b/ext/oci8/tests/coll_014.phpt @@ -11,8 +11,8 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE - ".$type_name." - "; + ".$type_name." + "; $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); diff --git a/ext/oci8/tests/coll_014_func.phpt b/ext/oci8/tests/coll_014_func.phpt index 24b0bbf8ba..fc9df35a7c 100644 --- a/ext/oci8/tests/coll_014_func.phpt +++ b/ext/oci8/tests/coll_014_func.phpt @@ -11,8 +11,8 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE - ".$type_name." - "; + ".$type_name." + "; $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); diff --git a/ext/oci8/tests/coll_015.phpt b/ext/oci8/tests/coll_015.phpt index 2ed2375ecc..d3bffd2fe5 100644 --- a/ext/oci8/tests/coll_015.phpt +++ b/ext/oci8/tests/coll_015.phpt @@ -11,8 +11,8 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE - ".$type_name." - "; + ".$type_name." + "; $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); diff --git a/ext/oci8/tests/coll_015_func.phpt b/ext/oci8/tests/coll_015_func.phpt index a9c16aec01..3685a28b96 100644 --- a/ext/oci8/tests/coll_015_func.phpt +++ b/ext/oci8/tests/coll_015_func.phpt @@ -11,8 +11,8 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE - ".$type_name." - "; + ".$type_name." + "; $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); diff --git a/ext/oci8/tests/coll_016.phpt b/ext/oci8/tests/coll_016.phpt index 80059688b3..d4b19efb43 100644 --- a/ext/oci8/tests/coll_016.phpt +++ b/ext/oci8/tests/coll_016.phpt @@ -11,8 +11,8 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE - ".$type_name." - "; + ".$type_name." + "; $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); diff --git a/ext/oci8/tests/coll_016_func.phpt b/ext/oci8/tests/coll_016_func.phpt index da26428d8d..95ed0588dc 100644 --- a/ext/oci8/tests/coll_016_func.phpt +++ b/ext/oci8/tests/coll_016_func.phpt @@ -11,8 +11,8 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE - ".$type_name." - "; + ".$type_name." + "; $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); diff --git a/ext/oci8/tests/coll_017.phpt b/ext/oci8/tests/coll_017.phpt index 81fdfb2553..0bd730934f 100644 --- a/ext/oci8/tests/coll_017.phpt +++ b/ext/oci8/tests/coll_017.phpt @@ -11,8 +11,8 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE - ".$type_name." - "; + ".$type_name." + "; $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); diff --git a/ext/oci8/tests/coll_017_func.phpt b/ext/oci8/tests/coll_017_func.phpt index c582eb0f8d..e3d9be2a43 100644 --- a/ext/oci8/tests/coll_017_func.phpt +++ b/ext/oci8/tests/coll_017_func.phpt @@ -11,8 +11,8 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE - ".$type_name." - "; + ".$type_name." + "; $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); diff --git a/ext/oci8/tests/commit_001.phpt b/ext/oci8/tests/commit_001.phpt index de4682eefc..d99a6b3cbf 100644 --- a/ext/oci8/tests/commit_001.phpt +++ b/ext/oci8/tests/commit_001.phpt @@ -14,20 +14,20 @@ require(__DIR__.'/create_table.inc'); $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"); } /* check with OCI_NO_AUTO_COMMIT mode */ for ($i = 0; $i<3; $i++) { - if (!oci_execute($s, OCI_NO_AUTO_COMMIT)) { - die("oci_execute(insert) failed!\n"); - } + if (!oci_execute($s, OCI_NO_AUTO_COMMIT)) { + die("oci_execute(insert) failed!\n"); + } } for ($i = 0; $i<3; $i++) { - if (!oci_execute($s, OCI_DEFAULT)) { - die("oci_execute(insert) failed!\n"); - } + if (!oci_execute($s, OCI_DEFAULT)) { + die("oci_execute(insert) failed!\n"); + } } @@ -36,19 +36,19 @@ var_dump(oci_rollback($c)); $select_sql = "select * from ".$schema.$table_name.""; if (!($select = oci_parse($c, $select_sql))) { - die("oci_parse(select) failed!\n"); + die("oci_parse(select) failed!\n"); } /* oci_fetch_all */ if (!oci_execute($select)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } var_dump(oci_fetch_all($select, $all)); var_dump($all); /* ocifetchstatement */ if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } $insert_sql = "insert into ".$schema.$table_name." (id, value) values (1,1)"; @@ -67,7 +67,7 @@ var_dump(oci_commit($c)); /* oci_fetch_all */ if (!oci_execute($select)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } var_dump(oci_fetch_all($select, $all)); var_dump($all); diff --git a/ext/oci8/tests/commit_002.phpt b/ext/oci8/tests/commit_002.phpt index b38d9aaa2d..4696f3b556 100644 --- a/ext/oci8/tests/commit_002.phpt +++ b/ext/oci8/tests/commit_002.phpt @@ -13,8 +13,8 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "drop table commit_002_tab", - "create table commit_002_tab + "drop table commit_002_tab", + "create table commit_002_tab ( x int constraint commit_002_tab_check_x check ( x > 0 ) deferrable initially immediate, y int constraint commit_002_tab_check_y check ( y > 0 ) deferrable initially deferred)" ); @@ -54,14 +54,12 @@ if (!$r) { // Clean up $stmtarray = array( - "drop table commit_002_tab" + "drop table commit_002_tab" ); oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- First Insert Could not execute: ORA-02290: %s (%s.COMMIT_002_TAB_CHECK_X) %s @@ -71,4 +69,3 @@ Warning: oci_commit(): ORA-02091: %s ORA-02290: %s (%s.COMMIT_002_TAB_CHECK_Y) %s in %scommit_002.php on line %d Could not commit: ORA-02091: %s ORA-02290: %s (%s.COMMIT_002_TAB_CHECK_Y) %s -===DONE=== diff --git a/ext/oci8/tests/commit_old.phpt b/ext/oci8/tests/commit_old.phpt index 658cfd24b3..bfbae9b597 100644 --- a/ext/oci8/tests/commit_old.phpt +++ b/ext/oci8/tests/commit_old.phpt @@ -14,13 +14,13 @@ require __DIR__.'/create_table.inc'; $insert_sql = "INSERT INTO ".$schema.$table_name." (id, value) VALUES (1,1)"; if (!($s = ociparse($c, $insert_sql))) { - die("ociparse(insert) failed!\n"); + die("ociparse(insert) failed!\n"); } for ($i = 0; $i<3; $i++) { - if (!ociexecute($s, OCI_DEFAULT)) { - die("ociexecute(insert) failed!\n"); - } + if (!ociexecute($s, OCI_DEFAULT)) { + die("ociexecute(insert) failed!\n"); + } } var_dump(ocirollback($c)); @@ -28,18 +28,18 @@ var_dump(ocirollback($c)); $select_sql = "SELECT * FROM ".$schema.$table_name.""; if (!($select = ociparse($c, $select_sql))) { - die("ociparse(select) failed!\n"); + die("ociparse(select) failed!\n"); } if (!oci_execute($select)) { - die("ociexecute(select) failed!\n"); + die("ociexecute(select) failed!\n"); } var_dump(ocifetchstatement($select, $all)); var_dump($all); /* ocifetchstatement */ if (!ociexecute($s)) { - die("ociexecute(select) failed!\n"); + die("ociexecute(select) failed!\n"); } $insert_sql = "INSERT INTO ".$schema.$table_name." (id, value) VALUES (1,1)"; @@ -57,7 +57,7 @@ for ($i = 0; $i<3; $i++) { var_dump(ocicommit($c)); if (!ociexecute($select)) { - die("ociexecute(select) failed!\n"); + die("ociexecute(select) failed!\n"); } var_dump(ocifetchstatement($select, $all)); var_dump($all); diff --git a/ext/oci8/tests/conn_attr.inc b/ext/oci8/tests/conn_attr.inc index f05f3bc064..c2e3c36442 100644 --- a/ext/oci8/tests/conn_attr.inc +++ b/ext/oci8/tests/conn_attr.inc @@ -30,29 +30,29 @@ if ((isset($matches[1]) && $matches[1] >= 11)) { foreach ($stmtarray as $stmt) { $s = oci_parse($c, $stmt); $r = @oci_execute($s); - if (!$r) { - $m = oci_error($s); - if (!in_array($m['code'], array( // ignore expected errors + if (!$r) { + $m = oci_error($s); + if (!in_array($m['code'], array( // ignore expected errors 942 // table or view does not exist , 1918 // user does not exist , 2289 // sequence does not exist , 4080 // trigger does not exist , 38802 // edition does not exist ))) { - echo "Error:" . $stmt . PHP_EOL . $m['message'] . PHP_EOL; + echo "Error:" . $stmt . PHP_EOL . $m['message'] . PHP_EOL; if ($m['code'] == 38807) { echo "You appear to already have an edition in use that prevents this PHP test from running. Query DBA_EDITIONS to see existing editions.". PHP_EOL; } die; - } - } + } + } } function get_attr($conn,$attr) { $sel_stmt="select " .$attr. " from v\$session where sid = - (select sid from v\$session where audsid = - sys_context('userenv','sessionid')) order by 1"; + (select sid from v\$session where audsid = + sys_context('userenv','sessionid')) order by 1"; $s2 = oci_parse($conn,$sel_stmt); oci_execute($s2,OCI_DEFAULT); while (oci_fetch($s2)) { @@ -66,10 +66,10 @@ function get_attr($conn,$attr) function get_conn($conn_type) { - $user = $GLOBALS['testuser']; - $password = $GLOBALS['testpassword']; - $dbase = $GLOBALS['dbase']; - switch($conn_type) { + $user = $GLOBALS['testuser']; + $password = $GLOBALS['testpassword']; + $dbase = $GLOBALS['dbase']; + switch($conn_type) { case 1: echo "Testing with oci_connect()\n"; return(oci_connect($user,$password,$dbase)); @@ -82,41 +82,41 @@ function get_conn($conn_type) echo "Testing with oci_new_connect()\n"; return(oci_new_connect($user,$password,$dbase)); break; - } + } } function set_attr($conn,$attr,$sufix) { - if (!strcmp($attr,'MODULE')) - $r = oci_set_module_name($conn,'PHP TEST'.$sufix); - else if (!strcmp($attr,'ACTION')) + if (!strcmp($attr,'MODULE')) + $r = oci_set_module_name($conn,'PHP TEST'.$sufix); + else if (!strcmp($attr,'ACTION')) $r = oci_set_action($conn,'TASK'.$sufix); - else if (!strcmp($attr,'CLIENT_INFO')) + else if (!strcmp($attr,'CLIENT_INFO')) $r = oci_set_client_info($conn,'INFO1'.$sufix); - else if (!strcmp($attr,'CLIENT_IDENTIFIER')) + else if (!strcmp($attr,'CLIENT_IDENTIFIER')) $r = oci_set_client_identifier($conn,'ID00'.$sufix); - else - echo "Pass one of the above four attributes!!!\n"; - if ($r) { - echo "Value of $attr has been set successfully\n"; + else + echo "Pass one of the above four attributes!!!\n"; + if ($r) { + echo "Value of $attr has been set successfully\n"; } - //Do a round-trip here - oci_server_version($conn); - return $r; + //Do a round-trip here + oci_server_version($conn); + return $r; } function set_edit_attr($value) { - $r = oci_set_edition($value); + $r = oci_set_edition($value); if ($r) { - echo " The value of edition has been successfully set\n"; + echo " The value of edition has been successfully set\n"; } - return $r; + return $r; } function get_edit_attr ($conn) { - $sel_stmt = "select sys_context('USERENV', 'CURRENT_EDITION_NAME') from dual"; + $sel_stmt = "select sys_context('USERENV', 'CURRENT_EDITION_NAME') from dual"; $s2 = oci_parse($conn,$sel_stmt); oci_execute($s2,OCI_DEFAULT); while (oci_fetch($s2)) { @@ -126,8 +126,8 @@ function get_edit_attr ($conn) { function get_sys_attr($conn,$attr) { - $sel_stmt="select " .$attr. " from v\$session where sid = - (select sid from v\$session where audsid = sys_context('userenv','sessionid')) order by 1"; + $sel_stmt="select " .$attr. " from v\$session where sid = + (select sid from v\$session where audsid = sys_context('userenv','sessionid')) order by 1"; $s2 = oci_parse($conn,$sel_stmt); oci_execute($s2,OCI_DEFAULT); while (oci_fetch($s2)) { @@ -136,14 +136,14 @@ function get_sys_attr($conn,$attr) } function clean_up($c) { - $stmtarray = array( + $stmtarray = array( "drop edition myedition1 cascade", "drop edition myedition cascade", "drop user " . $GLOBALS['testuser'] . " cascade", - ); + ); - foreach ($stmtarray as $stmt) { + foreach ($stmtarray as $stmt) { $s = oci_parse($c, $stmt); @oci_execute($s); - } + } } diff --git a/ext/oci8/tests/conn_attr_1.phpt b/ext/oci8/tests/conn_attr_1.phpt index 1c1f767398..ce23b2b5aa 100644 --- a/ext/oci8/tests/conn_attr_1.phpt +++ b/ext/oci8/tests/conn_attr_1.phpt @@ -36,19 +36,19 @@ echo"**Test 1.2 - Set and get values for the attributes **************\n"; $conn1 = get_conn(1); //oci_connect() foreach($attr_array as $attr) { - set_attr($conn1,$attr,1); + set_attr($conn1,$attr,1); get_attr($conn1,$attr); } $conn2 = get_conn(2); //oci_pconnect() foreach($attr_array as $attr) { - set_attr($conn2,$attr,2); + set_attr($conn2,$attr,2); get_attr($conn2,$attr); } $conn3 = get_conn(3); //oci_new_connect() foreach($attr_array as $attr) { - set_attr($conn3,$attr,3); + set_attr($conn3,$attr,3); get_attr($conn3,$attr); } diff --git a/ext/oci8/tests/conn_attr_2.phpt b/ext/oci8/tests/conn_attr_2.phpt index 898bd52bcd..61d59093b1 100644 --- a/ext/oci8/tests/conn_attr_2.phpt +++ b/ext/oci8/tests/conn_attr_2.phpt @@ -29,21 +29,21 @@ echo"**Set values using pconnect-1**\n"; var_dump($pc1 = oci_pconnect($testuser,$testpassword,$dbase)); foreach($attr_array as $attr) { - set_attr($pc1,$attr,100); + set_attr($pc1,$attr,100); } // using pc1 again echo"\n**Get values using pconnect-2**\n"; var_dump($pc3 = oci_pconnect($testuser,$testpassword,$dbase)); foreach($attr_array as $attr) { - get_attr($pc3,$attr); + get_attr($pc3,$attr); } // Get with different pconnect echo"\n**Get values using pconnect-3**\n"; var_dump($pc2 = oci_pconnect($testuser,$testpassword,$dbase,'UTF8')); foreach($attr_array as $attr) { - get_attr($pc2,$attr); + get_attr($pc2,$attr); } oci_close($pc1); @@ -54,7 +54,7 @@ oci_close($pc3); echo "\n**Re-open a pconnect()**\n"; var_dump($pc4 = oci_pconnect($testuser,$testpassword,$dbase)); foreach($attr_array as $attr) { - get_attr($pc4,$attr); + get_attr($pc4,$attr); } oci_close($pc4); @@ -68,10 +68,10 @@ if (!$sys_c1) { var_dump($e); } } else { - set_attr($sys_c1,'ACTION',10); - get_sys_attr($sys_c1,'ACTION'); - get_attr($sys_c1,'ACTION'); - oci_close($sys_c1); + set_attr($sys_c1,'ACTION',10); + get_sys_attr($sys_c1,'ACTION'); + get_attr($sys_c1,'ACTION'); + oci_close($sys_c1); } clean_up($c); diff --git a/ext/oci8/tests/conn_attr_4.phpt b/ext/oci8/tests/conn_attr_4.phpt index 46a219c05d..72ed493d8a 100644 --- a/ext/oci8/tests/conn_attr_4.phpt +++ b/ext/oci8/tests/conn_attr_4.phpt @@ -59,16 +59,16 @@ echo "\nSetting to different values \n"; $values_array = array(1000,NULL,'this is a very huge string with a length > 64 !!!!!this is a very huge string with a length > 64 !!!!!this is a very huge string with a length > 64 !!!!!this is a very huge string with a length > 64 !!!!!'); foreach($values_array as $val ) { - oci_set_module_name($c1,$val); - oci_set_client_identifier($c1,$val); - oci_set_client_info($c1,$val); - $r = oci_set_action($c1,$val); - if ($r) { - echo "Values set successfully to $val\n"; - foreach($attr_array as $attr) { + oci_set_module_name($c1,$val); + oci_set_client_identifier($c1,$val); + oci_set_client_info($c1,$val); + $r = oci_set_action($c1,$val); + if ($r) { + echo "Values set successfully to $val\n"; + foreach($attr_array as $attr) { get_attr($c1,$attr); } - } + } } clean_up($c); @@ -79,37 +79,37 @@ echo "Done\n"; Invalid Connection resource -Warning: oci_set_action() expects parameter 1 to be resource, null given in %s on line %d +Warning: oci_set_action(): Argument #1 must be of type resource, null given in %s on line %d NULL Invalid Connection resource 2 -Warning: oci_set_client_info() expects parameter 1 to be resource, %s given in %s on line %d +Warning: oci_set_client_info(): Argument #1 must be of type resource, %s given in %s on line %d NULL -Invalid Value +Invalid Value -Warning: oci_set_action() expects parameter 2 to be %s, resource given in %s on line %d +Warning: oci_set_action(): Argument #2 must be of type %s, resource given in %s on line %d NULL -Set Values multiple times +Set Values multiple times bool(true) bool(true) bool(true) bool(true) The value of ACTION is ACTION1 -Setting to different values +Setting to different values Values set successfully to 1000 The value of MODULE is 1000 The value of ACTION is 1000 The value of CLIENT_INFO is 1000 The value of CLIENT_IDENTIFIER is 1000 -Values set successfully to -The value of MODULE is -The value of ACTION is -The value of CLIENT_INFO is -The value of CLIENT_IDENTIFIER is +Values set successfully to +The value of MODULE is +The value of ACTION is +The value of CLIENT_INFO is +The value of CLIENT_IDENTIFIER is Warning: oci_set_module_name(): ORA-24960: %s OCI_ATTR_MODULE %s on line %d diff --git a/ext/oci8/tests/connect.phpt b/ext/oci8/tests/connect.phpt index d534e44871..f13d6fd421 100644 --- a/ext/oci8/tests/connect.phpt +++ b/ext/oci8/tests/connect.phpt @@ -8,10 +8,10 @@ oci_connect() require __DIR__."/connect.inc"; if (!empty($dbase)) { - var_dump(oci_connect($user, $password, $dbase)); + var_dump(oci_connect($user, $password, $dbase)); } else { - var_dump(oci_connect($user, $password)); + var_dump(oci_connect($user, $password)); } echo "Done\n"; diff --git a/ext/oci8/tests/connect_1.phpt b/ext/oci8/tests/connect_1.phpt index 6d76c8ddcc..297b0897b6 100644 --- a/ext/oci8/tests/connect_1.phpt +++ b/ext/oci8/tests/connect_1.phpt @@ -8,17 +8,17 @@ oci_pconnect() & oci_new_connect() require __DIR__."/connect.inc"; if (!empty($dbase)) { - var_dump($c1 = oci_pconnect($user, $password, $dbase)); + var_dump($c1 = oci_pconnect($user, $password, $dbase)); } else { - var_dump($c1 = oci_pconnect($user, $password)); + var_dump($c1 = oci_pconnect($user, $password)); } if (!empty($dbase)) { - var_dump($c2 = oci_new_connect($user, $password, $dbase)); + var_dump($c2 = oci_new_connect($user, $password, $dbase)); } else { - var_dump($c2 = oci_new_connect($user, $password)); + var_dump($c2 = oci_new_connect($user, $password)); } var_dump(oci_close($c1)); diff --git a/ext/oci8/tests/connect_1_old.phpt b/ext/oci8/tests/connect_1_old.phpt index 2014d59fe3..3ce756f51c 100644 --- a/ext/oci8/tests/connect_1_old.phpt +++ b/ext/oci8/tests/connect_1_old.phpt @@ -8,17 +8,17 @@ ociplogon() & ocinlogon() require __DIR__."/connect.inc"; if (!empty($dbase)) { - var_dump($c1 = ociplogon($user, $password, $dbase)); + var_dump($c1 = ociplogon($user, $password, $dbase)); } else { - var_dump($c1 = ociplogon($user, $password)); + var_dump($c1 = ociplogon($user, $password)); } if (!empty($dbase)) { - var_dump($c2 = ocinlogon($user, $password, $dbase)); + var_dump($c2 = ocinlogon($user, $password, $dbase)); } else { - var_dump($c2 = ocinlogon($user, $password)); + var_dump($c2 = ocinlogon($user, $password)); } var_dump(ocilogoff($c1)); diff --git a/ext/oci8/tests/connect_old.phpt b/ext/oci8/tests/connect_old.phpt index a2012bfd19..c55197fca1 100644 --- a/ext/oci8/tests/connect_old.phpt +++ b/ext/oci8/tests/connect_old.phpt @@ -8,10 +8,10 @@ ocilogon() require __DIR__."/connect.inc"; if (!empty($dbase)) { - var_dump(ocilogon($user, $password, $dbase)); + var_dump(ocilogon($user, $password, $dbase)); } else { - var_dump(ocilogon($user, $password)); + var_dump(ocilogon($user, $password)); } echo "Done\n"; diff --git a/ext/oci8/tests/connect_scope1.phpt b/ext/oci8/tests/connect_scope1.phpt index aefee2f882..684103b9f3 100644 --- a/ext/oci8/tests/connect_scope1.phpt +++ b/ext/oci8/tests/connect_scope1.phpt @@ -10,14 +10,14 @@ require(__DIR__.'/details.inc'); // Initialization $stmtarray = array( - "drop table connect_scope1_tab", - "create table connect_scope1_tab (c1 number)", + "drop table connect_scope1_tab", + "create table connect_scope1_tab (c1 number)", ); if (!empty($dbase)) - $c1 = oci_new_connect($user,$password,$dbase); + $c1 = oci_new_connect($user,$password,$dbase); else - $c1 = oci_new_connect($user,$password); + $c1 = oci_new_connect($user,$password); oci8_test_sql_execute($c1, $stmtarray); @@ -27,15 +27,15 @@ echo "Test 1 - oci_connect\n"; function f() { - global $user, $password, $dbase; - - if (!empty($dbase)) - $c = oci_connect($user,$password,$dbase); - else - $c = oci_connect($user,$password); - $s = oci_parse($c, "insert into connect_scope1_tab values (1)"); - oci_execute($s, OCI_DEFAULT); // no commit - return($s); // this keeps the connection refcount positive so the connection isn't closed + global $user, $password, $dbase; + + if (!empty($dbase)) + $c = oci_connect($user,$password,$dbase); + else + $c = oci_connect($user,$password); + $s = oci_parse($c, "insert into connect_scope1_tab values (1)"); + oci_execute($s, OCI_DEFAULT); // no commit + return($s); // this keeps the connection refcount positive so the connection isn't closed } $s2 = f(); @@ -60,7 +60,7 @@ var_dump($r); // Cleanup $stmtarray = array( - "drop table connect_scope1_tab" + "drop table connect_scope1_tab" ); oci8_test_sql_execute($c1, $stmtarray); diff --git a/ext/oci8/tests/connect_scope2.phpt b/ext/oci8/tests/connect_scope2.phpt index aa192b1459..9a2de41e30 100644 --- a/ext/oci8/tests/connect_scope2.phpt +++ b/ext/oci8/tests/connect_scope2.phpt @@ -10,14 +10,14 @@ require(__DIR__.'/details.inc'); // Initialization $stmtarray = array( - "drop table connect_scope2_tab", - "create table connect_scope2_tab (c1 number)", + "drop table connect_scope2_tab", + "create table connect_scope2_tab (c1 number)", ); if (!empty($dbase)) - $c1 = oci_new_connect($user,$password,$dbase); + $c1 = oci_new_connect($user,$password,$dbase); else - $c1 = oci_new_connect($user,$password); + $c1 = oci_new_connect($user,$password); oci8_test_sql_execute($c1, $stmtarray); @@ -27,15 +27,15 @@ echo "Test 1 - oci_pconnect\n"; function f() { - global $user, $password, $dbase; - - if (!empty($dbase)) - $c = oci_pconnect($user,$password,$dbase); - else - $c = oci_pconnect($user,$password); - $s = oci_parse($c, "insert into connect_scope2_tab values (1)"); - oci_execute($s, OCI_DEFAULT); // no commit - return($s); // this keeps the connection refcount positive so the connection isn't closed + global $user, $password, $dbase; + + if (!empty($dbase)) + $c = oci_pconnect($user,$password,$dbase); + else + $c = oci_pconnect($user,$password); + $s = oci_parse($c, "insert into connect_scope2_tab values (1)"); + oci_execute($s, OCI_DEFAULT); // no commit + return($s); // this keeps the connection refcount positive so the connection isn't closed } $s2 = f(); @@ -60,7 +60,7 @@ var_dump($r); // Cleanup $stmtarray = array( - "drop table connect_scope2_tab" + "drop table connect_scope2_tab" ); oci8_test_sql_execute($c1, $stmtarray); diff --git a/ext/oci8/tests/connect_scope_try1.phpt b/ext/oci8/tests/connect_scope_try1.phpt index d3628f9eaa..54f4cc552b 100644 --- a/ext/oci8/tests/connect_scope_try1.phpt +++ b/ext/oci8/tests/connect_scope_try1.phpt @@ -12,14 +12,14 @@ require(__DIR__.'/details.inc'); // Initialization $stmtarray = array( - "drop table scope_try1_tab", - "create table scope_try1_tab (c1 number)" + "drop table scope_try1_tab", + "create table scope_try1_tab (c1 number)" ); if (!empty($dbase)) - $c1 = oci_new_connect($user,$password,$dbase); + $c1 = oci_new_connect($user,$password,$dbase); else - $c1 = oci_new_connect($user,$password); + $c1 = oci_new_connect($user,$password); oci8_test_sql_execute($c1, $stmtarray); @@ -33,28 +33,28 @@ set_error_handler(function($x, $y) { throw new Exception($y, $x); }); try { - if (!empty($dbase)) - $c = oci_connect($user,$password,$dbase); - else - $c = oci_connect($user,$password); - $s = oci_parse($c, "insert into scope_try1_tab values (1)"); - oci_execute($s, OCI_DEFAULT); // no commit - $s = oci_parse($c, "insert into scope_try1_tab values (ABC)"); // syntax error -> throws exception - oci_execute($s, OCI_DEFAULT); // no commit + if (!empty($dbase)) + $c = oci_connect($user,$password,$dbase); + else + $c = oci_connect($user,$password); + $s = oci_parse($c, "insert into scope_try1_tab values (1)"); + oci_execute($s, OCI_DEFAULT); // no commit + $s = oci_parse($c, "insert into scope_try1_tab values (ABC)"); // syntax error -> throws exception + oci_execute($s, OCI_DEFAULT); // no commit } catch (Exception $e) { - echo "Caught Exception: ". $e->getMessage(), "\n"; - var_dump($c); + echo "Caught Exception: ". $e->getMessage(), "\n"; + var_dump($c); - // Verify data is not yet committed - $s1 = oci_parse($c1, "select * from scope_try1_tab"); - oci_execute($s1); - oci_fetch_all($s1, $r); - var_dump($r); + // Verify data is not yet committed + $s1 = oci_parse($c1, "select * from scope_try1_tab"); + oci_execute($s1); + oci_fetch_all($s1, $r); + var_dump($r); - // Now commit - oci_commit($c); + // Now commit + oci_commit($c); } // Verify data was committed in the Catch block @@ -67,7 +67,7 @@ var_dump($r); // Cleanup $stmtarray = array( - "drop table scope_try1_tab" + "drop table scope_try1_tab" ); oci8_test_sql_execute($c1, $stmtarray); diff --git a/ext/oci8/tests/connect_scope_try2.phpt b/ext/oci8/tests/connect_scope_try2.phpt index 76e6909f44..2ec7b78c5f 100644 --- a/ext/oci8/tests/connect_scope_try2.phpt +++ b/ext/oci8/tests/connect_scope_try2.phpt @@ -12,14 +12,14 @@ require(__DIR__.'/details.inc'); // Initialization $stmtarray = array( - "drop table scope_try2_tab", - "create table scope_try2_tab (c1 number)" + "drop table scope_try2_tab", + "create table scope_try2_tab (c1 number)" ); if (!empty($dbase)) - $c1 = oci_new_connect($user,$password,$dbase); + $c1 = oci_new_connect($user,$password,$dbase); else - $c1 = oci_new_connect($user,$password); + $c1 = oci_new_connect($user,$password); oci8_test_sql_execute($c1, $stmtarray); @@ -33,28 +33,28 @@ set_error_handler(function($x, $y) { throw new Exception($y, $x); }); try { - if (!empty($dbase)) - $c = oci_connect($user,$password,$dbase); - else - $c = oci_connect($user,$password); - $s = oci_parse($c, "insert into scope_try2_tab values (1)"); - oci_execute($s, OCI_DEFAULT); // no commit - $s = oci_parse($c, "insert into scope_try2_tab values (ABC)"); // syntax error -> throws exception - oci_execute($s, OCI_DEFAULT); // no commit + if (!empty($dbase)) + $c = oci_connect($user,$password,$dbase); + else + $c = oci_connect($user,$password); + $s = oci_parse($c, "insert into scope_try2_tab values (1)"); + oci_execute($s, OCI_DEFAULT); // no commit + $s = oci_parse($c, "insert into scope_try2_tab values (ABC)"); // syntax error -> throws exception + oci_execute($s, OCI_DEFAULT); // no commit } catch (Exception $e) { - echo "Caught Exception: ". $e->getMessage(), "\n"; - var_dump($c); + echo "Caught Exception: ". $e->getMessage(), "\n"; + var_dump($c); - // Verify data is not yet committed - $s1 = oci_parse($c1, "select * from scope_try2_tab"); - oci_execute($s1); - oci_fetch_all($s1, $r); - var_dump($r); + // Verify data is not yet committed + $s1 = oci_parse($c1, "select * from scope_try2_tab"); + oci_execute($s1); + oci_fetch_all($s1, $r); + var_dump($r); - // Now commit - oci_commit($c); + // Now commit + oci_commit($c); } // Verify data was committed in the Catch block @@ -67,7 +67,7 @@ var_dump($r); // Cleanup $stmtarray = array( - "drop table scope_try2_tab" + "drop table scope_try2_tab" ); oci8_test_sql_execute($c1, $stmtarray); diff --git a/ext/oci8/tests/connect_scope_try3.phpt b/ext/oci8/tests/connect_scope_try3.phpt index d9cbfce355..7c09750410 100644 --- a/ext/oci8/tests/connect_scope_try3.phpt +++ b/ext/oci8/tests/connect_scope_try3.phpt @@ -12,14 +12,14 @@ require(__DIR__.'/details.inc'); // Initialization $stmtarray = array( - "drop table scope_try3_tab", - "create table scope_try3_tab (c1 number)" + "drop table scope_try3_tab", + "create table scope_try3_tab (c1 number)" ); if (!empty($dbase)) - $c1 = oci_new_connect($user,$password,$dbase); + $c1 = oci_new_connect($user,$password,$dbase); else - $c1 = oci_new_connect($user,$password); + $c1 = oci_new_connect($user,$password); oci8_test_sql_execute($c1, $stmtarray); @@ -33,28 +33,28 @@ set_error_handler(function($x, $y) { throw new Exception($y, $x); }); try { - if (!empty($dbase)) - $c = oci_new_connect($user,$password,$dbase); - else - $c = oci_new_connect($user,$password); - $s = oci_parse($c, "insert into scope_try3_tab values (1)"); - oci_execute($s, OCI_DEFAULT); // no commit - $s = oci_parse($c, "insert into scope_try3_tab values (ABC)"); // syntax error -> throws exception - oci_execute($s, OCI_DEFAULT); // no commit + if (!empty($dbase)) + $c = oci_new_connect($user,$password,$dbase); + else + $c = oci_new_connect($user,$password); + $s = oci_parse($c, "insert into scope_try3_tab values (1)"); + oci_execute($s, OCI_DEFAULT); // no commit + $s = oci_parse($c, "insert into scope_try3_tab values (ABC)"); // syntax error -> throws exception + oci_execute($s, OCI_DEFAULT); // no commit } catch (Exception $e) { - echo "Caught Exception: ". $e->getMessage(), "\n"; - var_dump($c); + echo "Caught Exception: ". $e->getMessage(), "\n"; + var_dump($c); - // Verify data is not yet committed - $s1 = oci_parse($c1, "select * from scope_try3_tab"); - oci_execute($s1); - oci_fetch_all($s1, $r); - var_dump($r); + // Verify data is not yet committed + $s1 = oci_parse($c1, "select * from scope_try3_tab"); + oci_execute($s1); + oci_fetch_all($s1, $r); + var_dump($r); - // Now commit - oci_commit($c); + // Now commit + oci_commit($c); } // Verify data was committed in the Catch block @@ -67,7 +67,7 @@ var_dump($r); // Cleanup $stmtarray = array( - "drop table scope_try3_tab" + "drop table scope_try3_tab" ); oci8_test_sql_execute($c1, $stmtarray); diff --git a/ext/oci8/tests/connect_scope_try4.phpt b/ext/oci8/tests/connect_scope_try4.phpt index cdefe36ee9..04f82712a8 100644 --- a/ext/oci8/tests/connect_scope_try4.phpt +++ b/ext/oci8/tests/connect_scope_try4.phpt @@ -12,14 +12,14 @@ require(__DIR__.'/details.inc'); // Initialization $stmtarray = array( - "drop table scope_try4_tab", - "create table scope_try4_tab (c1 number)" + "drop table scope_try4_tab", + "create table scope_try4_tab (c1 number)" ); if (!empty($dbase)) - $c1 = oci_new_connect($user,$password,$dbase); + $c1 = oci_new_connect($user,$password,$dbase); else - $c1 = oci_new_connect($user,$password); + $c1 = oci_new_connect($user,$password); oci8_test_sql_execute($c1, $stmtarray); @@ -33,28 +33,28 @@ set_error_handler(function($x, $y) { throw new Exception($y, $x); }); try { - if (!empty($dbase)) - $c = oci_new_connect($user,$password,$dbase); - else - $c = oci_new_connect($user,$password); - $s = oci_parse($c, "insert into scope_try4_tab values (1)"); - oci_execute($s, OCI_DEFAULT); // no commit - $s = oci_parse($c, "insert into scope_try4_tab values (ABC)"); // syntax error -> throws exception - oci_execute($s, OCI_DEFAULT); // no commit + if (!empty($dbase)) + $c = oci_new_connect($user,$password,$dbase); + else + $c = oci_new_connect($user,$password); + $s = oci_parse($c, "insert into scope_try4_tab values (1)"); + oci_execute($s, OCI_DEFAULT); // no commit + $s = oci_parse($c, "insert into scope_try4_tab values (ABC)"); // syntax error -> throws exception + oci_execute($s, OCI_DEFAULT); // no commit } catch (Exception $e) { - echo "Caught Exception: ". $e->getMessage(), "\n"; - var_dump($c); + echo "Caught Exception: ". $e->getMessage(), "\n"; + var_dump($c); - // Verify data is not yet committed - $s1 = oci_parse($c1, "select * from scope_try4_tab"); - oci_execute($s1); - oci_fetch_all($s1, $r); - var_dump($r); + // Verify data is not yet committed + $s1 = oci_parse($c1, "select * from scope_try4_tab"); + oci_execute($s1); + oci_fetch_all($s1, $r); + var_dump($r); - // Now commit - oci_commit($c); + // Now commit + oci_commit($c); } // Verify data was committed in the Catch block @@ -67,7 +67,7 @@ var_dump($r); // Cleanup $stmtarray = array( - "drop table scope_try4_tab" + "drop table scope_try4_tab" ); oci8_test_sql_execute($c1, $stmtarray); diff --git a/ext/oci8/tests/connect_scope_try5.phpt b/ext/oci8/tests/connect_scope_try5.phpt index 1e99d0a2e1..43b7ff0049 100644 --- a/ext/oci8/tests/connect_scope_try5.phpt +++ b/ext/oci8/tests/connect_scope_try5.phpt @@ -12,14 +12,14 @@ require(__DIR__.'/details.inc'); // Initialization $stmtarray = array( - "drop table scope_try5_tab", - "create table scope_try5_tab (c1 number)" + "drop table scope_try5_tab", + "create table scope_try5_tab (c1 number)" ); if (!empty($dbase)) - $c1 = oci_new_connect($user,$password,$dbase); + $c1 = oci_new_connect($user,$password,$dbase); else - $c1 = oci_new_connect($user,$password); + $c1 = oci_new_connect($user,$password); oci8_test_sql_execute($c1, $stmtarray); @@ -33,28 +33,28 @@ set_error_handler(function($x, $y) { throw new Exception($y, $x); }); try { - if (!empty($dbase)) - $c = oci_pconnect($user,$password,$dbase); - else - $c = oci_pconnect($user,$password); - $s = oci_parse($c, "insert into scope_try5_tab values (1)"); - oci_execute($s, OCI_DEFAULT); // no commit - $s = oci_parse($c, "insert into scope_try5_tab values (ABC)"); // syntax error -> throws exception - oci_execute($s, OCI_DEFAULT); // no commit + if (!empty($dbase)) + $c = oci_pconnect($user,$password,$dbase); + else + $c = oci_pconnect($user,$password); + $s = oci_parse($c, "insert into scope_try5_tab values (1)"); + oci_execute($s, OCI_DEFAULT); // no commit + $s = oci_parse($c, "insert into scope_try5_tab values (ABC)"); // syntax error -> throws exception + oci_execute($s, OCI_DEFAULT); // no commit } catch (Exception $e) { - echo "Caught Exception: ". $e->getMessage(), "\n"; - var_dump($c); + echo "Caught Exception: ". $e->getMessage(), "\n"; + var_dump($c); - // Verify data is not yet committed - $s1 = oci_parse($c1, "select * from scope_try5_tab"); - oci_execute($s1); - oci_fetch_all($s1, $r); - var_dump($r); + // Verify data is not yet committed + $s1 = oci_parse($c1, "select * from scope_try5_tab"); + oci_execute($s1); + oci_fetch_all($s1, $r); + var_dump($r); - // Now commit - oci_commit($c); + // Now commit + oci_commit($c); } // Verify data was committed in the Catch block @@ -67,7 +67,7 @@ var_dump($r); // Cleanup $stmtarray = array( - "drop table scope_try5_tab" + "drop table scope_try5_tab" ); oci8_test_sql_execute($c1, $stmtarray); diff --git a/ext/oci8/tests/connect_scope_try6.phpt b/ext/oci8/tests/connect_scope_try6.phpt index 84ea97ac43..fc31bddfd8 100644 --- a/ext/oci8/tests/connect_scope_try6.phpt +++ b/ext/oci8/tests/connect_scope_try6.phpt @@ -12,14 +12,14 @@ require(__DIR__.'/details.inc'); // Initialization $stmtarray = array( - "drop table scope_try6_tab", - "create table scope_try6_tab (c1 number)" + "drop table scope_try6_tab", + "create table scope_try6_tab (c1 number)" ); if (!empty($dbase)) - $c1 = oci_new_connect($user,$password,$dbase); + $c1 = oci_new_connect($user,$password,$dbase); else - $c1 = oci_new_connect($user,$password); + $c1 = oci_new_connect($user,$password); oci8_test_sql_execute($c1, $stmtarray); @@ -33,28 +33,28 @@ set_error_handler(function($x, $y) { throw new Exception($y, $x); }); try { - if (!empty($dbase)) - $c = oci_pconnect($user,$password,$dbase); - else - $c = oci_pconnect($user,$password); - $s = oci_parse($c, "insert into scope_try6_tab values (1)"); - oci_execute($s, OCI_DEFAULT); // no commit - $s = oci_parse($c, "insert into scope_try6_tab values (ABC)"); // syntax error -> throws exception - oci_execute($s, OCI_DEFAULT); // no commit + if (!empty($dbase)) + $c = oci_pconnect($user,$password,$dbase); + else + $c = oci_pconnect($user,$password); + $s = oci_parse($c, "insert into scope_try6_tab values (1)"); + oci_execute($s, OCI_DEFAULT); // no commit + $s = oci_parse($c, "insert into scope_try6_tab values (ABC)"); // syntax error -> throws exception + oci_execute($s, OCI_DEFAULT); // no commit } catch (Exception $e) { - echo "Caught Exception: ". $e->getMessage(), "\n"; - var_dump($c); + echo "Caught Exception: ". $e->getMessage(), "\n"; + var_dump($c); - // Verify data is not yet committed - $s1 = oci_parse($c1, "select * from scope_try6_tab"); - oci_execute($s1); - oci_fetch_all($s1, $r); - var_dump($r); + // Verify data is not yet committed + $s1 = oci_parse($c1, "select * from scope_try6_tab"); + oci_execute($s1); + oci_fetch_all($s1, $r); + var_dump($r); - // Now commit - oci_commit($c); + // Now commit + oci_commit($c); } // Verify data was committed in the Catch block @@ -67,7 +67,7 @@ var_dump($r); // Cleanup $stmtarray = array( - "drop table scope_try6_tab" + "drop table scope_try6_tab" ); oci8_test_sql_execute($c1, $stmtarray); diff --git a/ext/oci8/tests/connect_without_oracle_home.phpt b/ext/oci8/tests/connect_without_oracle_home.phpt index d83f30e0e9..203fd57e92 100644 --- a/ext/oci8/tests/connect_without_oracle_home.phpt +++ b/ext/oci8/tests/connect_without_oracle_home.phpt @@ -23,16 +23,13 @@ ORACLE_HOME="" require __DIR__."/details.inc"; if (!empty($dbase)) { - var_dump(oci_connect($user, $password, $dbase)); + var_dump(oci_connect($user, $password, $dbase)); } else { - var_dump(oci_connect($user, $password)); + var_dump(oci_connect($user, $password)); } ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Warning: oci_connect(): OCIEnvNlsCreate() failed. There is something wrong with your system - please check that ORACLE_HOME and %s are set and point to the right directories in %s on line %d bool(false) -===DONE=== diff --git a/ext/oci8/tests/connect_without_oracle_home_11.phpt b/ext/oci8/tests/connect_without_oracle_home_11.phpt index a7c3fbba83..85ac993877 100644 --- a/ext/oci8/tests/connect_without_oracle_home_11.phpt +++ b/ext/oci8/tests/connect_without_oracle_home_11.phpt @@ -26,19 +26,16 @@ ORACLE_HOME="" require __DIR__."/details.inc"; if (!empty($dbase)) { - var_dump(oci_connect($user, $password, $dbase)); + var_dump(oci_connect($user, $password, $dbase)); } else { - var_dump(oci_connect($user, $password)); + var_dump(oci_connect($user, $password)); } ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Warning: oci_connect(): OCIEnvNlsCreate() failed. There is something wrong with your system - please check that ORACLE_HOME and %s are set and point to the right directories in %s on line %d Warning: oci_connect(): Error while trying to retrieve text for error ORA-01804 in %s on line %d bool(false) -===DONE=== diff --git a/ext/oci8/tests/connect_without_oracle_home_old.phpt b/ext/oci8/tests/connect_without_oracle_home_old.phpt index d77b3e3699..bd217acd77 100644 --- a/ext/oci8/tests/connect_without_oracle_home_old.phpt +++ b/ext/oci8/tests/connect_without_oracle_home_old.phpt @@ -19,19 +19,16 @@ ORACLE_HOME="" require __DIR__."/details.inc"; if (!empty($dbase)) { - var_dump(ocilogon($user, $password, $dbase)); + var_dump(ocilogon($user, $password, $dbase)); } else { - var_dump(ocilogon($user, $password)); + var_dump(ocilogon($user, $password)); } ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Warning: ocilogon(): OCIEnvNlsCreate() failed. There is something wrong with your system - please check that ORACLE_HOME and %s are set and point to the right directories in %s on line %d Warning: ocilogon(): %s ORA-01804 in %s on line %d bool(false) -===DONE=== diff --git a/ext/oci8/tests/connect_without_oracle_home_old_11.phpt b/ext/oci8/tests/connect_without_oracle_home_old_11.phpt index c3c21f9d4c..243741bfde 100644 --- a/ext/oci8/tests/connect_without_oracle_home_old_11.phpt +++ b/ext/oci8/tests/connect_without_oracle_home_old_11.phpt @@ -26,19 +26,16 @@ ORACLE_HOME="" require __DIR__."/details.inc"; if (!empty($dbase)) { - var_dump(ocilogon($user, $password, $dbase)); + var_dump(ocilogon($user, $password, $dbase)); } else { - var_dump(ocilogon($user, $password)); + var_dump(ocilogon($user, $password)); } ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Warning: ocilogon(): OCIEnvNlsCreate() failed. There is something wrong with your system - please check that ORACLE_HOME and %s are set and point to the right directories in %s on line %d Warning: ocilogon(): Error while trying to retrieve text for error ORA-01804 in %sconnect_without_oracle_home_old_11.php on line %d bool(false) -===DONE=== diff --git a/ext/oci8/tests/cursor_bind.phpt b/ext/oci8/tests/cursor_bind.phpt index d0f862b0d6..17b4b0d91a 100644 --- a/ext/oci8/tests/cursor_bind.phpt +++ b/ext/oci8/tests/cursor_bind.phpt @@ -54,8 +54,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- array(2) { [0]=> @@ -76,4 +74,3 @@ array(2) { string(1) "1" } bool(false) -===DONE=== diff --git a/ext/oci8/tests/cursors.phpt b/ext/oci8/tests/cursors.phpt index 8a33f51649..a9fa0dcb41 100644 --- a/ext/oci8/tests/cursors.phpt +++ b/ext/oci8/tests/cursors.phpt @@ -14,17 +14,17 @@ require __DIR__."/create_table.inc"; $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"); } for ($i = 0; $i<3; $i++) { - if (!oci_execute($s)) { - die("oci_execute(insert) failed!\n"); - } + if (!oci_execute($s)) { + die("oci_execute(insert) failed!\n"); + } } if (!oci_commit($c)) { - die("oci_commit() failed!\n"); + die("oci_commit() failed!\n"); } $sql = "select CURSOR(select * from ".$schema.$table_name.") as curs FROM dual"; @@ -33,13 +33,13 @@ $stmt = oci_parse($c, $sql); oci_execute($stmt); while ($data = oci_fetch_assoc($stmt)) { - oci_execute($data["CURS"]); - $subdata = oci_fetch_assoc($data["CURS"]); - var_dump($subdata); - var_dump(oci_cancel($data["CURS"])); - $subdata = oci_fetch_assoc($data["CURS"]); - var_dump($subdata); - var_dump(oci_cancel($data["CURS"])); + oci_execute($data["CURS"]); + $subdata = oci_fetch_assoc($data["CURS"]); + var_dump($subdata); + var_dump(oci_cancel($data["CURS"])); + $subdata = oci_fetch_assoc($data["CURS"]); + var_dump($subdata); + var_dump(oci_cancel($data["CURS"])); } require __DIR__."/drop_table.inc"; diff --git a/ext/oci8/tests/cursors_old.phpt b/ext/oci8/tests/cursors_old.phpt index b130da5165..7c5c668f62 100644 --- a/ext/oci8/tests/cursors_old.phpt +++ b/ext/oci8/tests/cursors_old.phpt @@ -30,13 +30,13 @@ $stmt = ociparse($c, $sql); ociexecute($stmt); while ($result = ocifetchinto($stmt, $data, OCI_ASSOC)) { - ociexecute($data["CURS"]); - ocifetchinto($data["CURS"], $subdata, OCI_ASSOC); - var_dump($subdata); - var_dump(ocicancel($data["CURS"])); - ocifetchinto($data["CURS"], $subdata, OCI_ASSOC); - var_dump($subdata); - var_dump(ocicancel($data["CURS"])); + ociexecute($data["CURS"]); + ocifetchinto($data["CURS"], $subdata, OCI_ASSOC); + var_dump($subdata); + var_dump(ocicancel($data["CURS"])); + ocifetchinto($data["CURS"], $subdata, OCI_ASSOC); + var_dump($subdata); + var_dump(ocicancel($data["CURS"])); } // Cleanup diff --git a/ext/oci8/tests/db_op_1.phpt b/ext/oci8/tests/db_op_1.phpt index 7ca97952d7..70941839f7 100644 --- a/ext/oci8/tests/db_op_1.phpt +++ b/ext/oci8/tests/db_op_1.phpt @@ -41,8 +41,6 @@ dq($c, 'select /*+ MONITOR */ * from dual'); dq($c, 'select dbop_name from v$sql_monitor where dbop_name is not null order by dbop_exec_id desc'); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 array(1) { @@ -53,4 +51,3 @@ array(1) { ["DBOP_NAME"]=> string(7) "db_op_1" } -===DONE=== diff --git a/ext/oci8/tests/db_op_2.phpt b/ext/oci8/tests/db_op_2.phpt index 26c5d30865..4d4624b737 100644 --- a/ext/oci8/tests/db_op_2.phpt +++ b/ext/oci8/tests/db_op_2.phpt @@ -49,8 +49,6 @@ dq($c, 'select /*+ MONITOR */ \'dboptest\' from dual'); dq($c, 'select sql_text, dbop_name from v$sql_monitor where sql_text like \'%dboptest%\' order by dbop_exec_id desc'); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 array(1) { @@ -76,4 +74,3 @@ array(2) { ["DBOP_NAME"]=> NULL } -===DONE=== diff --git a/ext/oci8/tests/dbmsoutput.phpt b/ext/oci8/tests/dbmsoutput.phpt index 40da29654d..01ba9db0b5 100644 --- a/ext/oci8/tests/dbmsoutput.phpt +++ b/ext/oci8/tests/dbmsoutput.phpt @@ -71,20 +71,20 @@ function getdbmsoutput_do($c) function getdbmsoutput_do2($c) { - $orignumlines = $numlines = 100; - $s = oci_parse($c, "begin dbms_output.get_lines(:lines, :numlines); end;"); - $r = oci_bind_by_name($s, ":numlines", $numlines); - $res = array(); - while ($numlines >= $orignumlines) { - oci_bind_array_by_name($s, ":lines", $lines, $numlines, 255, SQLT_CHR); - oci_execute($s); - if ($numlines == 0) { - break; - } - $res = array_merge($res, array_slice($lines, 0, $numlines)); - unset($lines); - } - return $res; + $orignumlines = $numlines = 100; + $s = oci_parse($c, "begin dbms_output.get_lines(:lines, :numlines); end;"); + $r = oci_bind_by_name($s, ":numlines", $numlines); + $res = array(); + while ($numlines >= $orignumlines) { + oci_bind_array_by_name($s, ":lines", $lines, $numlines, 255, SQLT_CHR); + oci_execute($s); + if ($numlines == 0) { + break; + } + $res = array_merge($res, array_slice($lines, 0, $numlines)); + unset($lines); + } + return $res; } function getdbmsoutput_pl($c) @@ -124,14 +124,12 @@ var_dump(getdbmsoutput_pl($c)); // Clean up $stmtarray = array( - "drop procedure dbmsoutput_proc" + "drop procedure dbmsoutput_proc" ); oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 array(1) { @@ -747,4 +745,3 @@ array(100) { [99]=> string(53) "99 test 4 Hello, world! Lots and lots and ... of text" } -===DONE=== diff --git a/ext/oci8/tests/debug.phpt b/ext/oci8/tests/debug.phpt index a197639af6..f66eeb9698 100644 --- a/ext/oci8/tests/debug.phpt +++ b/ext/oci8/tests/debug.phpt @@ -10,10 +10,10 @@ require(__DIR__."/details.inc"); oci_internal_debug(true); if (!empty($dbase)) { - oci_connect($user, $password, $dbase); + oci_connect($user, $password, $dbase); } else { - oci_connect($user, $password); + oci_connect($user, $password); } oci_internal_debug(false); diff --git a/ext/oci8/tests/default_prefetch0.phpt b/ext/oci8/tests/default_prefetch0.phpt index 6a62328713..4dce73431c 100644 --- a/ext/oci8/tests/default_prefetch0.phpt +++ b/ext/oci8/tests/default_prefetch0.phpt @@ -26,11 +26,11 @@ oci8_test_sql_execute($c, $stmtarray); $select_sql = "select * from default_prefetch_tab"; if (!($s = oci_parse($c, $select_sql))) { - die("oci_parse(select) failed!\n"); + die("oci_parse(select) failed!\n"); } if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } var_dump(oci_fetch($s)); diff --git a/ext/oci8/tests/default_prefetch1.phpt b/ext/oci8/tests/default_prefetch1.phpt index ca9590a82f..dbe92e75f4 100644 --- a/ext/oci8/tests/default_prefetch1.phpt +++ b/ext/oci8/tests/default_prefetch1.phpt @@ -26,11 +26,11 @@ oci8_test_sql_execute($c, $stmtarray); $select_sql = "select * from default_prefetch1_tab"; if (!($s = oci_parse($c, $select_sql))) { - die("oci_parse(select) failed!\n"); + die("oci_parse(select) failed!\n"); } if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } var_dump(oci_fetch($s)); diff --git a/ext/oci8/tests/default_prefetch2.phpt b/ext/oci8/tests/default_prefetch2.phpt index 1d2a80b845..6d01fb1bac 100644 --- a/ext/oci8/tests/default_prefetch2.phpt +++ b/ext/oci8/tests/default_prefetch2.phpt @@ -26,13 +26,13 @@ oci8_test_sql_execute($c, $stmtarray); $select_sql = "select * from default_prefetch2_tab"; if (!($s = oci_parse($c, $select_sql))) { - die("oci_parse(select) failed!\n"); + die("oci_parse(select) failed!\n"); } var_dump(oci_set_prefetch($s, 10)); if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } var_dump(oci_fetch($s)); diff --git a/ext/oci8/tests/define.phpt b/ext/oci8/tests/define.phpt index e3f19e6337..8fd459e10e 100644 --- a/ext/oci8/tests/define.phpt +++ b/ext/oci8/tests/define.phpt @@ -29,7 +29,7 @@ oci_define_by_name($stmt, "STRING", $string, 20); oci_execute($stmt); while (oci_fetch($stmt)) { - var_dump($string); + var_dump($string); } // Cleanup diff --git a/ext/oci8/tests/define0.phpt b/ext/oci8/tests/define0.phpt index b783ec647c..fecbf23757 100644 --- a/ext/oci8/tests/define0.phpt +++ b/ext/oci8/tests/define0.phpt @@ -29,7 +29,7 @@ $string = ''; oci_define_by_name($stmt, "STRING", $string, 20); oci_execute($stmt); while (oci_fetch($stmt)) { - var_dump($string); + var_dump($string); } echo "Test 2\n"; @@ -51,11 +51,8 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 string(%d) "some" Test 2 string(%d) "some" -===DONE=== diff --git a/ext/oci8/tests/define1.phpt b/ext/oci8/tests/define1.phpt index 28c4b7f1f4..37efddafb9 100644 --- a/ext/oci8/tests/define1.phpt +++ b/ext/oci8/tests/define1.phpt @@ -32,7 +32,7 @@ var_dump(oci_define_by_name($stmt, "")); oci_execute($stmt); while (oci_fetch($stmt)) { - var_dump($string); + var_dump($string); } // Cleanup diff --git a/ext/oci8/tests/define2.phpt b/ext/oci8/tests/define2.phpt index a018bbcb44..9dbac4620b 100644 --- a/ext/oci8/tests/define2.phpt +++ b/ext/oci8/tests/define2.phpt @@ -11,8 +11,8 @@ require(__DIR__.'/skipif.inc'); require(__DIR__."/connect.inc"); $stmtarray = array( - "drop table phptestrawtable", - "create table phptestrawtable( id number(10), fileimage raw(1000))" + "drop table phptestrawtable", + "create table phptestrawtable( id number(10), fileimage raw(1000))" ); oci8_test_sql_execute($c, $stmtarray); @@ -34,8 +34,8 @@ var_dump(oci_define_by_name($stmt, 'FILEIMAGE', $fi)); oci_execute($stmt); while (oci_fetch($stmt)) { - var_dump($fi); - echo "file md5:" . md5($fi) . "\n"; + var_dump($fi); + echo "file md5:" . md5($fi) . "\n"; } echo "Test 2\n"; @@ -44,8 +44,8 @@ var_dump(oci_define_by_name($stmt, 'FILEIMAGE', $fi)); oci_execute($stmt); while (oci_fetch($stmt)) { - var_dump($fi); - echo "file md5:" . md5($fi) . "\n"; + var_dump($fi); + echo "file md5:" . md5($fi) . "\n"; } echo "Test 3 - test repeatability\n"; @@ -54,8 +54,8 @@ var_dump(oci_define_by_name($stmt, 'FILEIMAGE', $fi, SQLT_STR)); oci_execute($stmt); while (oci_fetch($stmt)) { - var_dump($fi); - echo "file md5:" . md5($fi) . "\n"; + var_dump($fi); + echo "file md5:" . md5($fi) . "\n"; } echo "Test 4 - wrong type\n"; @@ -64,8 +64,8 @@ var_dump(oci_define_by_name($stmt, 'FILEIMAGE', $fi, SQLT_RSET)); oci_execute($stmt); while (oci_fetch($stmt)) { - var_dump($fi); - echo "file md5:" . md5($fi) . "\n"; + var_dump($fi); + echo "file md5:" . md5($fi) . "\n"; } // Cleanup diff --git a/ext/oci8/tests/define3.phpt b/ext/oci8/tests/define3.phpt index 669ae39d93..e70f636938 100644 --- a/ext/oci8/tests/define3.phpt +++ b/ext/oci8/tests/define3.phpt @@ -11,8 +11,8 @@ require(__DIR__.'/skipif.inc'); require(__DIR__."/connect.inc"); $stmtarray = array( - "drop table phpdefblobtable", - "create table phpdefblobtable (id number(10), fileimage blob)" + "drop table phpdefblobtable", + "create table phpdefblobtable (id number(10), fileimage blob)" ); oci8_test_sql_execute($c, $stmtarray); @@ -76,7 +76,7 @@ while (oci_fetch($stmt)) { } $stmtarray = array( - "drop table phpdefblobtable" + "drop table phpdefblobtable" ); oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/define4.phpt b/ext/oci8/tests/define4.phpt index 25296f96d3..d7ffc3fd58 100644 --- a/ext/oci8/tests/define4.phpt +++ b/ext/oci8/tests/define4.phpt @@ -30,12 +30,12 @@ oci_execute($stmt); echo "Test 2\n"; while (oci_fetch($stmt)) { - var_dump(oci_result($stmt, 'VALUE')); - var_dump($string); - var_dump(oci_result($stmt, 'STRING')); - var_dump($string); - var_dump(oci_result($stmt, 'VALUE')); - var_dump(oci_result($stmt, 'STRING')); + var_dump(oci_result($stmt, 'VALUE')); + var_dump($string); + var_dump(oci_result($stmt, 'STRING')); + var_dump($string); + var_dump(oci_result($stmt, 'VALUE')); + var_dump(oci_result($stmt, 'STRING')); } echo "Test 3\n"; diff --git a/ext/oci8/tests/define5.phpt b/ext/oci8/tests/define5.phpt index 2dd9980d45..3f1e57741b 100644 --- a/ext/oci8/tests/define5.phpt +++ b/ext/oci8/tests/define5.phpt @@ -25,8 +25,8 @@ $stmt = oci_parse($c, "select string from define5_tab where id = 1"); oci_execute($stmt); var_dump(oci_define_by_name($stmt, "STRING", $string)); while (oci_fetch($stmt)) { - var_dump($string); // gives NULL - var_dump(oci_result($stmt, 'STRING')); + var_dump($string); // gives NULL + var_dump(oci_result($stmt, 'STRING')); } echo "Test 2 - normal define order\n"; @@ -35,15 +35,15 @@ var_dump(oci_define_by_name($stmt, "STRING", $string)); oci_execute($stmt); while (oci_fetch($stmt)) { - var_dump($string); + var_dump($string); } echo "Test 3 - no new define done\n"; $stmt = oci_parse($c, "select string from define5_tab where id = 2"); oci_execute($stmt); while (oci_fetch($stmt)) { - var_dump($string); // not updated with new value - var_dump(oci_result($stmt, 'STRING')); + var_dump($string); // not updated with new value + var_dump(oci_result($stmt, 'STRING')); } // Cleanup diff --git a/ext/oci8/tests/define6.phpt b/ext/oci8/tests/define6.phpt index c23cd452c6..a59ba30a60 100644 --- a/ext/oci8/tests/define6.phpt +++ b/ext/oci8/tests/define6.phpt @@ -119,8 +119,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 - define last NULL @@ -135,4 +133,3 @@ string(1) "1" Test 6 - fetch on wrong handle Warning: oci_fetch_row(): ORA-24374: %s in %sdefine6.php on line %d -===DONE=== diff --git a/ext/oci8/tests/define_old.phpt b/ext/oci8/tests/define_old.phpt index 634a86d370..25458e1283 100644 --- a/ext/oci8/tests/define_old.phpt +++ b/ext/oci8/tests/define_old.phpt @@ -29,7 +29,7 @@ ocidefinebyname($stmt, "STRING", $string, 20); ociexecute($stmt); while (ocifetch($stmt)) { - var_dump($string); + var_dump($string); } // Cleanup diff --git a/ext/oci8/tests/descriptors.phpt b/ext/oci8/tests/descriptors.phpt index 193e1e76f8..44d4ab0a01 100644 --- a/ext/oci8/tests/descriptors.phpt +++ b/ext/oci8/tests/descriptors.phpt @@ -12,11 +12,11 @@ require __DIR__.'/connect.inc'; require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO - ".$schema.$table_name." (blob) - VALUES (empty_blob()) - RETURNING - blob - INTO :v_blob "; + ".$schema.$table_name." (blob) + VALUES (empty_blob()) + RETURNING + blob + INTO :v_blob "; $statement = oci_parse($c,$ora_sql); $blob = oci_new_descriptor($c,OCI_D_LOB); diff --git a/ext/oci8/tests/details.inc b/ext/oci8/tests/details.inc index 731b562d0a..101ebfcd79 100644 --- a/ext/oci8/tests/details.inc +++ b/ext/oci8/tests/details.inc @@ -12,32 +12,32 @@ */ if (file_exists(dirname(__FILE__)."/details_local.inc")) { - include(dirname(__FILE__)."/details_local.inc"); // this file is not part of the source distribution; make it your own local variant of details.inc + include(dirname(__FILE__)."/details_local.inc"); // this file is not part of the source distribution; make it your own local variant of details.inc } else { - if (false !== getenv('PHP_OCI8_TEST_DB')) { - $user = getenv('PHP_OCI8_TEST_USER'); // Database username for tests - $password = getenv('PHP_OCI8_TEST_PASS'); // Password for $user - $dbase = getenv('PHP_OCI8_TEST_DB'); // Database connection string - $test_drcp = getenv('PHP_OCI8_TEST_DRCP'); - if (false !== $test_drcp && 0 == strcasecmp($test_drcp,'TRUE')) { - $test_drcp = TRUE; - } else { - $test_drcp = FALSE; - } - } else { - $user = "system"; - $password = "oracle"; - $dbase = "localhost/XE"; - $test_drcp = FALSE; - } + if (false !== getenv('PHP_OCI8_TEST_DB')) { + $user = getenv('PHP_OCI8_TEST_USER'); // Database username for tests + $password = getenv('PHP_OCI8_TEST_PASS'); // Password for $user + $dbase = getenv('PHP_OCI8_TEST_DB'); // Database connection string + $test_drcp = getenv('PHP_OCI8_TEST_DRCP'); + if (false !== $test_drcp && 0 == strcasecmp($test_drcp,'TRUE')) { + $test_drcp = TRUE; + } else { + $test_drcp = FALSE; + } + } else { + $user = "system"; + $password = "oracle"; + $dbase = "localhost/XE"; + $test_drcp = FALSE; + } - /* - * Common object names for scripts to use - */ + /* + * Common object names for scripts to use + */ - $table_name = "tb".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5); - $type_name = strtoupper("tp".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5)); - $schema = ''; + $table_name = "tb".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5); + $type_name = strtoupper("tp".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5)); + $schema = ''; } @@ -59,14 +59,14 @@ if (!function_exists('oci8_test_sql_execute')) { if (!$r) { $m = oci_error($s); if (!in_array($m['code'], array( // ignore expected errors - 942 // table or view does not exist + 942 // table or view does not exist , 1918 // user does not exist , 2024 // database link not found , 2289 // sequence does not exist , 4080 // trigger does not exist , 38802 // edition does not exist ))) { - echo "oci8_test_sql_execute() error:". PHP_EOL . $stmt . PHP_EOL . $m['message'] . PHP_EOL; + echo "oci8_test_sql_execute() error:". PHP_EOL . $stmt . PHP_EOL . $m['message'] . PHP_EOL; } } } diff --git a/ext/oci8/tests/drcp_characterset.phpt b/ext/oci8/tests/drcp_characterset.phpt index c5a5339e04..fdcacead93 100644 --- a/ext/oci8/tests/drcp_characterset.phpt +++ b/ext/oci8/tests/drcp_characterset.phpt @@ -31,17 +31,17 @@ var_dump($p2); //character sets if((int)$c1 === (int)$c2) - echo "First and third connections share a resource: NOT OK\n"; + echo "First and third connections share a resource: NOT OK\n"; else - echo "First and third connections are different: OK\n"; + echo "First and third connections are different: OK\n"; // The two connections p1 and p2 should not share resources as they use different //character sets if((int)$p1 === (int)$p2) - echo "Second and fourth connections share a resource: NOT OK\n"; + echo "Second and fourth connections share a resource: NOT OK\n"; else - echo "Second and fourth connections are different: OK\n"; + echo "Second and fourth connections are different: OK\n"; // Close all the connections oci_close($c1); diff --git a/ext/oci8/tests/drcp_conn_close1.phpt b/ext/oci8/tests/drcp_conn_close1.phpt index 18ed1cec72..b1afb4779b 100644 --- a/ext/oci8/tests/drcp_conn_close1.phpt +++ b/ext/oci8/tests/drcp_conn_close1.phpt @@ -13,7 +13,7 @@ require __DIR__."/details.inc"; // Test will open a connection // Close the connection // Open another connection -// With oci_close() being a no-op, the same conneciton will be returned +// With oci_close() being a no-op, the same connection will be returned echo "This is with a OCI_CONNECT\n"; @@ -30,9 +30,9 @@ oci_close($conn2); // Compare the resource numbers if ($rn1 === $rn2) - echo "Both connections share a resource : OK\n"; + echo "Both connections share a resource : OK\n"; else - echo "Both connections are different : NOT OK\n"; + echo "Both connections are different : NOT OK\n"; echo "Done\n"; diff --git a/ext/oci8/tests/drcp_conn_close2.phpt b/ext/oci8/tests/drcp_conn_close2.phpt index 4a20c9cf72..cb4df083a6 100644 --- a/ext/oci8/tests/drcp_conn_close2.phpt +++ b/ext/oci8/tests/drcp_conn_close2.phpt @@ -14,7 +14,7 @@ require __DIR__."/details.inc"; // Close the connection // Open another connection // With oci_close() the connection is released to the pool and hence the -// the second conneciton will be different +// the second connection will be different // OCI_CONNECT @@ -31,9 +31,9 @@ oci_close($conn2); // Compare the resource numbers if ($rn1 === $rn2) - echo "Both connections share a resource : NOT OK\n"; + echo "Both connections share a resource : NOT OK\n"; else - echo "Both connections are different : OK\n"; + echo "Both connections are different : OK\n"; echo "Done\n"; diff --git a/ext/oci8/tests/drcp_functions.inc b/ext/oci8/tests/drcp_functions.inc index 320026486e..595f82da1f 100644 --- a/ext/oci8/tests/drcp_functions.inc +++ b/ext/oci8/tests/drcp_functions.inc @@ -4,90 +4,90 @@ function drcp_create_table($conn) { - $create_sql = "CREATE TABLE DRCPTEST (id NUMBER, name VARCHAR2(10), dept VARCHAR2(10))"; - $statement = oci_parse($conn, $create_sql); - oci_execute($statement); + $create_sql = "CREATE TABLE DRCPTEST (id NUMBER, name VARCHAR2(10), dept VARCHAR2(10))"; + $statement = oci_parse($conn, $create_sql); + oci_execute($statement); - $id_values = array(100,101,102,103,104,105,106,107,108); - $name_values = array("WIILIAMS","JOHN","SMITH","JONES","ADAMS","ROBERT", - "BILL","LAWSON","MARY"); - $dept_values = array("ACCOUNTS","HR","HR","ADMIN","ACCOUNTS","HR", - "ACCOUNTS","HR","ACCOUNTS"); - for($i=0; $i<8; $i++) { - $insert = "INSERT INTO DRCPTEST VALUES(".$id_values[$i].",'". $name_values[$i]."','".$dept_values[$i]."')"; - $s = oci_parse($conn, $insert); - oci_execute($s); - } + $id_values = array(100,101,102,103,104,105,106,107,108); + $name_values = array("WIILIAMS","JOHN","SMITH","JONES","ADAMS","ROBERT", + "BILL","LAWSON","MARY"); + $dept_values = array("ACCOUNTS","HR","HR","ADMIN","ACCOUNTS","HR", + "ACCOUNTS","HR","ACCOUNTS"); + for($i=0; $i<8; $i++) { + $insert = "INSERT INTO DRCPTEST VALUES(".$id_values[$i].",'". $name_values[$i]."','".$dept_values[$i]."')"; + $s = oci_parse($conn, $insert); + oci_execute($s); + } } function drcp_drop_table($conn) { - $ora_sql = "DROP TABLE DRCPTEST"; - $statement = oci_parse($conn, $ora_sql); - oci_execute($statement); + $ora_sql = "DROP TABLE DRCPTEST"; + $statement = oci_parse($conn, $ora_sql); + oci_execute($statement); } function drcp_update_table($conn) { - $update_stmt ="Update drcptest set dept ='NEWDEPT' where id = 105"; - $s1 = oci_parse($conn,$update_stmt); - oci_execute($s1,OCI_DEFAULT); - echo "Update done-- DEPT value has been set to NEWDEPT\n"; + $update_stmt ="Update drcptest set dept ='NEWDEPT' where id = 105"; + $s1 = oci_parse($conn,$update_stmt); + oci_execute($s1,OCI_DEFAULT); + echo "Update done-- DEPT value has been set to NEWDEPT\n"; } function drcp_select_value($conn) { - $sel_stmt="select dept from drcptest where id=105"; - $s2 = oci_parse($conn,$sel_stmt); - oci_execute($s2,OCI_DEFAULT); - while(oci_fetch($s2)) { - echo "The value of DEPT for id 105 is ".oci_result($s2,1)."\n"; - } + $sel_stmt="select dept from drcptest where id=105"; + $s2 = oci_parse($conn,$sel_stmt); + oci_execute($s2,OCI_DEFAULT); + while(oci_fetch($s2)) { + echo "The value of DEPT for id 105 is ".oci_result($s2,1)."\n"; + } } function drcp_select_packagevar($conn) { - $sel_stmt="select drcp_test_package.f1 as f1 from dual"; - $s2 = oci_parse($conn, $sel_stmt); - oci_define_by_name($s2,'f1',$ret_num); - oci_execute($s2); - while(oci_fetch($s2)) { - echo " The value of the package variable is ".oci_result($s2,1)."\n"; - } + $sel_stmt="select drcp_test_package.f1 as f1 from dual"; + $s2 = oci_parse($conn, $sel_stmt); + oci_define_by_name($s2,'f1',$ret_num); + oci_execute($s2); + while(oci_fetch($s2)) { + echo " The value of the package variable is ".oci_result($s2,1)."\n"; + } } function drcp_set_packagevar($conn,$num) { - $set_stmt = "begin drcp_test_package.p1($num); end;"; - $s1 = oci_parse($conn,$set_stmt); - oci_execute($s1); - echo " Package variable value set to " .$num."\n"; + $set_stmt = "begin drcp_test_package.p1($num); end;"; + $s1 = oci_parse($conn,$set_stmt); + oci_execute($s1); + echo " Package variable value set to " .$num."\n"; } function drcp_create_package($c) { - $create_package_stmt = "create or replace package drcp_test_package as - var int :=0; - procedure p1(var1 int); - function f1 return number; - end;"; - $s1 = oci_parse($c, $create_package_stmt); - oci_execute($s1); + $create_package_stmt = "create or replace package drcp_test_package as + var int :=0; + procedure p1(var1 int); + function f1 return number; + end;"; + $s1 = oci_parse($c, $create_package_stmt); + oci_execute($s1); - $package_body = "create or replace package body drcp_test_package as - procedure p1(var1 int) is - begin - var :=var1; - end; - function f1 return number is - begin - return drcp_test_package.var; - end; - end;"; + $package_body = "create or replace package body drcp_test_package as + procedure p1(var1 int) is + begin + var :=var1; + end; + function f1 return number is + begin + return drcp_test_package.var; + end; + end;"; - $s2 = oci_parse($c, $package_body); - oci_execute($s2); + $s2 = oci_parse($c, $package_body); + oci_execute($s2); } ?> diff --git a/ext/oci8/tests/drcp_newconnect.phpt b/ext/oci8/tests/drcp_newconnect.phpt index cf4b6de17b..3c41edbb73 100644 --- a/ext/oci8/tests/drcp_newconnect.phpt +++ b/ext/oci8/tests/drcp_newconnect.phpt @@ -24,9 +24,9 @@ $rn2 = (int)$c2; // rn1 and rn2 should be different. if ($rn1 === $rn2) - echo "First and second connections share a resource: Not OK\n"; + echo "First and second connections share a resource: Not OK\n"; else - echo "First and second connections are different OK\n"; + echo "First and second connections are different OK\n"; // Close the connections oci_close($c1); diff --git a/ext/oci8/tests/drcp_pconn_close1.phpt b/ext/oci8/tests/drcp_pconn_close1.phpt index 83dad880d9..e4849169ae 100644 --- a/ext/oci8/tests/drcp_pconn_close1.phpt +++ b/ext/oci8/tests/drcp_pconn_close1.phpt @@ -13,7 +13,7 @@ require __DIR__."/details.inc"; // Test will open a persistent connection // Close the connection // Open another connection -// With oci_close() being a no-op, the same conneciton will be returned +// With oci_close() being a no-op, the same connection will be returned echo "This is with a OCI_PCONNECT\n"; var_dump($conn1 = oci_pconnect($user,$password,$dbase)); @@ -29,9 +29,9 @@ oci_close($conn2); // Compare the resource numbers if ($rn1 === $rn2) - echo "Both connections share a resource : OK\n"; + echo "Both connections share a resource : OK\n"; else - echo "Both connections are different : NOT OK\n"; + echo "Both connections are different : NOT OK\n"; echo "Done\n"; diff --git a/ext/oci8/tests/drcp_pconn_close2.phpt b/ext/oci8/tests/drcp_pconn_close2.phpt index 02bed68358..4961cb9545 100644 --- a/ext/oci8/tests/drcp_pconn_close2.phpt +++ b/ext/oci8/tests/drcp_pconn_close2.phpt @@ -31,9 +31,9 @@ oci_close($conn2); // Compare the resource numbers if ($rn1 === $rn2) - echo "Both connections share a resource : NOT OK\n"; + echo "Both connections share a resource : NOT OK\n"; else - echo "Both connections are different : OK\n"; + echo "Both connections are different : OK\n"; echo "Done\n"; diff --git a/ext/oci8/tests/drcp_scope1.phpt b/ext/oci8/tests/drcp_scope1.phpt index 78e2e900c9..807c352a20 100644 --- a/ext/oci8/tests/drcp_scope1.phpt +++ b/ext/oci8/tests/drcp_scope1.phpt @@ -42,32 +42,32 @@ function2($user,$password,$dbase,$conn_type); function function1($user,$password,$dbase,$conn_type) { - switch($conn_type) - { - case 1: - var_dump($conn1 = oci_new_connect($user,$password,$dbase)); - break; - case 2: - var_dump($conn1 = oci_connect($user,$password,$dbase)); - break; - } - drcp_update_table($conn1); + switch($conn_type) + { + case 1: + var_dump($conn1 = oci_new_connect($user,$password,$dbase)); + break; + case 2: + var_dump($conn1 = oci_connect($user,$password,$dbase)); + break; + } + drcp_update_table($conn1); } // This is the second scope function function2($user,$password,$dbase,$conn_type) { - switch($conn_type) - { - case 1: - var_dump($conn1 = oci_new_connect($user,$password,$dbase)); - break; - case 2: - var_dump($conn1 = oci_connect($user,$password,$dbase)); - break; - } - drcp_select_value($conn1); + switch($conn_type) + { + case 1: + var_dump($conn1 = oci_new_connect($user,$password,$dbase)); + break; + case 2: + var_dump($conn1 = oci_connect($user,$password,$dbase)); + break; + } + drcp_select_value($conn1); } drcp_drop_table($c); diff --git a/ext/oci8/tests/drcp_scope2.phpt b/ext/oci8/tests/drcp_scope2.phpt index 05a4c558ec..99e102075d 100644 --- a/ext/oci8/tests/drcp_scope2.phpt +++ b/ext/oci8/tests/drcp_scope2.phpt @@ -42,32 +42,32 @@ function2($user,$password,$dbase,$conn_type); function function1($user,$password,$dbase,$conn_type) { - switch($conn_type) - { - case 1: - var_dump($conn1 = oci_new_connect($user,$password,$dbase)); - break; - case 2: - var_dump($conn1 = oci_connect($user,$password,$dbase)); - break; - } - drcp_update_table($conn1); + switch($conn_type) + { + case 1: + var_dump($conn1 = oci_new_connect($user,$password,$dbase)); + break; + case 2: + var_dump($conn1 = oci_connect($user,$password,$dbase)); + break; + } + drcp_update_table($conn1); } // This is the second scope function function2($user,$password,$dbase,$conn_type) { - switch($conn_type) - { - case 1: - var_dump($conn1 = oci_new_connect($user,$password,$dbase)); - break; - case 2: - var_dump($conn1 = oci_connect($user,$password,$dbase)); - break; - } - drcp_select_value($conn1); + switch($conn_type) + { + case 1: + var_dump($conn1 = oci_new_connect($user,$password,$dbase)); + break; + case 2: + var_dump($conn1 = oci_connect($user,$password,$dbase)); + break; + } + drcp_select_value($conn1); } drcp_drop_table($c); oci_close($c); diff --git a/ext/oci8/tests/drcp_scope3.phpt b/ext/oci8/tests/drcp_scope3.phpt index 975f87bed9..8d97d48e99 100644 --- a/ext/oci8/tests/drcp_scope3.phpt +++ b/ext/oci8/tests/drcp_scope3.phpt @@ -32,16 +32,16 @@ function2($user,$password,$dbase); function function1($user,$password,$dbase) { - var_dump($c = oci_pconnect($user,$password,$dbase)); - drcp_update_table($c); + var_dump($c = oci_pconnect($user,$password,$dbase)); + drcp_update_table($c); } // This is the second scope function function2($user,$password,$dbase) { - var_dump($c = oci_pconnect($user,$password,$dbase)); - drcp_select_value($c); + var_dump($c = oci_pconnect($user,$password,$dbase)); + drcp_select_value($c); } drcp_drop_table($c); diff --git a/ext/oci8/tests/drcp_scope4.phpt b/ext/oci8/tests/drcp_scope4.phpt index dced1c3f1c..abc631a437 100644 --- a/ext/oci8/tests/drcp_scope4.phpt +++ b/ext/oci8/tests/drcp_scope4.phpt @@ -35,16 +35,16 @@ function2($user,$password,$dbase); function function1($user,$password,$dbase) { - var_dump($c = oci_pconnect($user,$password,$dbase)); - drcp_update_table($c); + var_dump($c = oci_pconnect($user,$password,$dbase)); + drcp_update_table($c); } // This is the second scope function function2($user,$password,$dbase) { - var_dump($c = oci_pconnect($user,$password,$dbase)); - drcp_select_value($c); + var_dump($c = oci_pconnect($user,$password,$dbase)); + drcp_select_value($c); } drcp_drop_table($c); diff --git a/ext/oci8/tests/drcp_scope5.phpt b/ext/oci8/tests/drcp_scope5.phpt index d3ccb56da0..b84853423a 100644 --- a/ext/oci8/tests/drcp_scope5.phpt +++ b/ext/oci8/tests/drcp_scope5.phpt @@ -35,17 +35,17 @@ function2($user,$password,$dbase); function function1($user,$password,$dbase) { - var_dump($c = oci_pconnect($user,$password,$dbase)); - drcp_update_table($c); + var_dump($c = oci_pconnect($user,$password,$dbase)); + drcp_update_table($c); } // This is the second scope function function2($user,$password,$dbase) { - var_dump($c = oci_pconnect($user,$password,$dbase)); - drcp_select_value($c); - oci_commit($c); + var_dump($c = oci_pconnect($user,$password,$dbase)); + drcp_select_value($c); + oci_commit($c); } drcp_drop_table($c); diff --git a/ext/oci8/tests/driver_name.phpt b/ext/oci8/tests/driver_name.phpt index 29b2cef520..c9d1181ef6 100644 --- a/ext/oci8/tests/driver_name.phpt +++ b/ext/oci8/tests/driver_name.phpt @@ -43,7 +43,7 @@ echo "Done\n"; function get_attr($conn) { - $sel_stmt = "select client_driver + $sel_stmt = "select client_driver from v\$session_connect_info sci, v\$session s where sci.client_driver is not null and sci.sid = s.sid diff --git a/ext/oci8/tests/driver_name_11gR2.phpt b/ext/oci8/tests/driver_name_11gR2.phpt index bb82b92fa3..6eb2e0d6e7 100644 --- a/ext/oci8/tests/driver_name_11gR2.phpt +++ b/ext/oci8/tests/driver_name_11gR2.phpt @@ -40,7 +40,7 @@ echo "Done\n"; function get_attr($conn) { - $sel_stmt = "select client_driver + $sel_stmt = "select client_driver from v\$session_connect_info sci, v\$session s where sci.client_driver is not null and sci.sid = s.sid diff --git a/ext/oci8/tests/dupcolnames.phpt b/ext/oci8/tests/dupcolnames.phpt index 40d2c99b13..1fddc6cf23 100644 --- a/ext/oci8/tests/dupcolnames.phpt +++ b/ext/oci8/tests/dupcolnames.phpt @@ -57,8 +57,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 - OCI_ASSOC array(3) { @@ -99,4 +97,3 @@ array(7) { [3]=> string(5) "jones" } -===DONE=== diff --git a/ext/oci8/tests/edition_1.phpt b/ext/oci8/tests/edition_1.phpt index 9bdf699a70..b75dfe4350 100644 --- a/ext/oci8/tests/edition_1.phpt +++ b/ext/oci8/tests/edition_1.phpt @@ -39,11 +39,11 @@ $testpassword = 'testuser'; require(__DIR__."/conn_attr.inc"); function select_fn($conn) { - $s = oci_parse($conn,"select * from view_ed"); - oci_execute($s); - while ($row = oci_fetch_row($s)) { - var_dump($row); - } + $s = oci_parse($conn,"select * from view_ed"); + oci_execute($s); + while ($row = oci_fetch_row($s)) { + var_dump($row); + } } /* Create a editon MYEDITION create a view view_ed in MYEDITION1. diff --git a/ext/oci8/tests/edition_2.phpt b/ext/oci8/tests/edition_2.phpt index 054e685943..a556fb4a17 100644 --- a/ext/oci8/tests/edition_2.phpt +++ b/ext/oci8/tests/edition_2.phpt @@ -63,7 +63,7 @@ get_edit_attr($pc1); oci_close($pc1); -echo"\n\n**Test 1.3 change the value and verify with existing conenctions.*********\n"; +echo"\n\n**Test 1.3 change the value and verify with existing connections.*********\n"; set_edit_attr('MYEDITION1'); get_edit_attr($conn2); get_edit_attr($conn3); // Old value @@ -87,12 +87,12 @@ oci_close($c5); echo "\n\n**Test 1.4 - with different type of values *********\n"; $values_array = array(123,NULL,'NO EDITION','edition name which has more than thirty chars!!!edition name which has more than thirty chars!!!'); foreach ($values_array as $val ) { - set_edit_attr($val); - $c1 = get_conn(1); //oci_connect() - if ($c1) { - get_edit_attr($c1); - oci_close($c1); - } + set_edit_attr($val); + $c1 = get_conn(1); //oci_connect() + if ($c1) { + get_edit_attr($c1); + oci_close($c1); + } } echo "\n\n**Test 1.5 - Negative case with an invalid string value. *********\n"; @@ -131,7 +131,7 @@ echo " Set the value back using oci-set_edition\n"; set_edit_attr('MYEDITION'); get_edit_attr($c2); -echo " Get the value with a new conenction\n"; +echo " Get the value with a new connection\n"; $c3 = get_conn(1); get_edit_attr($c3); @@ -149,7 +149,7 @@ echo "Done\n"; function set_scope() { - $r = set_edit_attr('MYEDITION1'); + $r = set_edit_attr('MYEDITION1'); } function get_scope() { @@ -158,8 +158,8 @@ function get_scope() { $m = oci_error(); die("Error:" . $m['message']); } - get_edit_attr($sc1); - oci_close($sc1); + get_edit_attr($sc1); + oci_close($sc1); } ?> --EXPECTF-- @@ -178,7 +178,7 @@ The value of current EDITION is MYEDITION The value of current EDITION is MYEDITION -**Test 1.3 change the value and verify with existing conenctions.********* +**Test 1.3 change the value and verify with existing connections.********* The value of edition has been successfully set The value of current EDITION is MYEDITION The value of current EDITION is MYEDITION @@ -235,7 +235,7 @@ The value of current EDITION is MYEDITION Set the value back using oci-set_edition The value of edition has been successfully set The value of current EDITION is MYEDITION - Get the value with a new conenction + Get the value with a new connection Testing with oci_connect() The value of current EDITION is MYEDITION diff --git a/ext/oci8/tests/error3.phpt b/ext/oci8/tests/error3.phpt index c993a97b5d..0da7a43d38 100644 --- a/ext/oci8/tests/error3.phpt +++ b/ext/oci8/tests/error3.phpt @@ -31,10 +31,7 @@ end;"); oci_execute($s); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 Warning: oci_execute(): ORA-20333: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBab in %serror3.php on line %d -===DONE=== diff --git a/ext/oci8/tests/error_parse.phpt b/ext/oci8/tests/error_parse.phpt index 1992826618..548ed3bfc0 100644 --- a/ext/oci8/tests/error_parse.phpt +++ b/ext/oci8/tests/error_parse.phpt @@ -15,49 +15,49 @@ require(__DIR__.'/details.inc'); // Test parse error for normal connection if (!empty($dbase)) { - $c1 = oci_connect($user,$password,$dbase); + $c1 = oci_connect($user,$password,$dbase); } else { - $c1 = oci_connect($user,$password); + $c1 = oci_connect($user,$password); } $s = @oci_parse($c1, "select ' from dual"); if (!$s) { - echo "Normal connection: Parse error\n"; - $m = oci_error($c1); - var_dump($m); + echo "Normal connection: Parse error\n"; + $m = oci_error($c1); + var_dump($m); } // Test parse error for new connection if (!empty($dbase)) { - $c2 = oci_new_connect($user,$password,$dbase); + $c2 = oci_new_connect($user,$password,$dbase); } else { - $c2 = oci_new_connect($user,$password); + $c2 = oci_new_connect($user,$password); } $s = @oci_parse($c2, "select ' from dual"); if (!$s) { - echo "New connection: Parse error\n"; - $m = oci_error($c2); - var_dump($m); + echo "New connection: Parse error\n"; + $m = oci_error($c2); + var_dump($m); } // Test parse error for persistent connection if (!empty($dbase)) { - $c3 = oci_pconnect($user,$password,$dbase); + $c3 = oci_pconnect($user,$password,$dbase); } else { - $c3 = oci_pconnect($user,$password); + $c3 = oci_pconnect($user,$password); } $s = @oci_parse($c3, "select ' from dual"); if (!$s) { - echo "Persistent connection: Parse error\n"; - $m = oci_error($c3); - var_dump($m); + echo "Persistent connection: Parse error\n"; + $m = oci_error($c3); + var_dump($m); } // Verify that passing no connection doesn't affect future calls diff --git a/ext/oci8/tests/error_set.phpt b/ext/oci8/tests/error_set.phpt index 95673f554a..ed04407098 100644 --- a/ext/oci8/tests/error_set.phpt +++ b/ext/oci8/tests/error_set.phpt @@ -51,8 +51,6 @@ $r = oci_set_client_info($c, $s); var_dump($r); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 bool(false) @@ -69,4 +67,3 @@ bool(true) bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/oci8/tests/extauth_01.phpt b/ext/oci8/tests/extauth_01.phpt index ba48b0eb58..db23097d82 100644 --- a/ext/oci8/tests/extauth_01.phpt +++ b/ext/oci8/tests/extauth_01.phpt @@ -18,8 +18,8 @@ echo "Test 1\n"; $c = oci_connect('/', 'notemtpy', 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -27,8 +27,8 @@ echo "Test 2\n"; $c = oci_connect('notemtpy', 'notemtpy', 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -36,8 +36,8 @@ echo "Test 3\n"; $c = oci_connect('notemtpy', '', 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -45,8 +45,8 @@ echo "Test 4\n"; $c = oci_connect('a', 'b', 'c', null, OCI_SYSDBA+OCI_SYSOPER); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -54,8 +54,8 @@ echo "Test 5\n"; $c = oci_connect('a', 'b', 'c', null, OCI_SYSDBA+OCI_SYSOPER+OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -63,8 +63,8 @@ echo "Test 6\n"; $c = oci_connect('', '', 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -72,8 +72,8 @@ echo "Test 7\n"; $c = oci_connect('/', '', 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -81,8 +81,8 @@ echo "Test 8\n"; $c = oci_connect('/', null, 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -90,8 +90,8 @@ echo "Test 9\n"; $c = oci_connect('/', '', 'd', null, OCI_SYSDBA+OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -99,15 +99,13 @@ echo "Test 10\n"; $c = oci_connect('/', '', 'd', null, OCI_SYSOPER+OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 @@ -195,4 +193,3 @@ array(4) { string(0) "" } bool(false) -===DONE=== diff --git a/ext/oci8/tests/extauth_02.phpt b/ext/oci8/tests/extauth_02.phpt index ea665eb918..c8c3dd6725 100644 --- a/ext/oci8/tests/extauth_02.phpt +++ b/ext/oci8/tests/extauth_02.phpt @@ -17,8 +17,8 @@ echo "Test 1\n"; $c = oci_new_connect('/', 'notemtpy', 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -26,8 +26,8 @@ echo "Test 2\n"; $c = oci_new_connect('notemtpy', 'notemtpy', 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -35,8 +35,8 @@ echo "Test 3\n"; $c = oci_new_connect('notemtpy', '', 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -44,8 +44,8 @@ echo "Test 4\n"; $c = oci_new_connect('a', 'b', 'c', null, OCI_SYSDBA+OCI_SYSOPER); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -53,8 +53,8 @@ echo "Test 5\n"; $c = oci_new_connect('a', 'b', 'c', null, OCI_SYSDBA+OCI_SYSOPER+OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -62,8 +62,8 @@ echo "Test 6\n"; $c = oci_new_connect('', '', 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -71,8 +71,8 @@ echo "Test 7\n"; $c = oci_new_connect('/', '', 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -80,8 +80,8 @@ echo "Test 8\n"; $c = oci_new_connect('/', null, 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -89,8 +89,8 @@ echo "Test 9\n"; $c = oci_new_connect('/', '', 'd', null, OCI_SYSDBA+OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -98,15 +98,13 @@ echo "Test 10\n"; $c = oci_new_connect('/', '', 'd', null, OCI_SYSOPER+OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 @@ -194,4 +192,3 @@ array(4) { string(0) "" } bool(false) -===DONE=== diff --git a/ext/oci8/tests/extauth_03.phpt b/ext/oci8/tests/extauth_03.phpt index 3ced42fc23..863f94499b 100644 --- a/ext/oci8/tests/extauth_03.phpt +++ b/ext/oci8/tests/extauth_03.phpt @@ -17,8 +17,8 @@ echo "Test 1\n"; $c = oci_pconnect('/', 'notemtpy', 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -26,8 +26,8 @@ echo "Test 2\n"; $c = oci_pconnect('notemtpy', 'notemtpy', 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -35,8 +35,8 @@ echo "Test 3\n"; $c = oci_pconnect('notemtpy', '', 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -44,8 +44,8 @@ echo "Test 4\n"; $c = oci_pconnect('a', 'b', 'c', null, OCI_SYSDBA+OCI_SYSOPER); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -53,8 +53,8 @@ echo "Test 5\n"; $c = oci_pconnect('a', 'b', 'c', null, OCI_SYSDBA+OCI_SYSOPER+OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -62,8 +62,8 @@ echo "Test 6\n"; $c = oci_pconnect('', '', 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -71,8 +71,8 @@ echo "Test 7\n"; $c = oci_pconnect('/', '', 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -80,8 +80,8 @@ echo "Test 8\n"; $c = oci_pconnect('/', null, 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -89,8 +89,8 @@ echo "Test 9\n"; $c = oci_pconnect('/', '', 'd', null, OCI_SYSDBA+OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -98,15 +98,13 @@ echo "Test 10\n"; $c = oci_pconnect('/', '', 'd', null, OCI_SYSOPER+OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 @@ -194,4 +192,3 @@ array(4) { string(0) "" } bool(false) -===DONE=== diff --git a/ext/oci8/tests/extauth_04.phpt b/ext/oci8/tests/extauth_04.phpt index 1597c2a942..5f4e64fc84 100644 --- a/ext/oci8/tests/extauth_04.phpt +++ b/ext/oci8/tests/extauth_04.phpt @@ -14,8 +14,8 @@ echo "Test 1\n"; $c = oci_connect('/', '', 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -23,8 +23,8 @@ echo "Test 2\n"; $c = oci_new_connect('/', '', 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); @@ -32,14 +32,12 @@ echo "Test 3\n"; $c = oci_pconnect('/', '', 'anything', null, OCI_CRED_EXT); if (!$c) { - $m = oci_error(); - var_dump($m); + $m = oci_error(); + var_dump($m); } var_dump($c); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 @@ -56,4 +54,3 @@ Test 3 Warning: oci_pconnect(): External Authentication is not supported on Windows in %s on line %d bool(false) bool(false) -===DONE=== diff --git a/ext/oci8/tests/fetch.phpt b/ext/oci8/tests/fetch.phpt index eeba992db2..eae30bad23 100644 --- a/ext/oci8/tests/fetch.phpt +++ b/ext/oci8/tests/fetch.phpt @@ -22,18 +22,18 @@ oci8_test_sql_execute($c, $stmtarray); // Run Test if (!($s = oci_parse($c, "select * from fetch_tab"))) { - die("oci_parse(select) failed!\n"); + die("oci_parse(select) failed!\n"); } if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } while(ocifetch($s)) { - $row = ociresult($s, 1); - $row1 = ociresult($s, 2); - var_dump($row); - var_dump($row1); + $row = ociresult($s, 1); + $row1 = ociresult($s, 2); + var_dump($row); + var_dump($row1); } // Cleanup diff --git a/ext/oci8/tests/fetch_all1.phpt b/ext/oci8/tests/fetch_all1.phpt index 2d27f8e02b..b531364109 100644 --- a/ext/oci8/tests/fetch_all1.phpt +++ b/ext/oci8/tests/fetch_all1.phpt @@ -20,19 +20,19 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); if (!($s = oci_parse($c, "select * from fetch_all_tab"))) { - die("oci_parse(select) failed!\n"); + die("oci_parse(select) failed!\n"); } /* oci_fetch_all */ if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } var_dump(oci_fetch_all($s, $all)); var_dump($all); /* ocifetchstatement */ if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } var_dump(ocifetchstatement($s, $all)); diff --git a/ext/oci8/tests/fetch_all2.phpt b/ext/oci8/tests/fetch_all2.phpt index cafd0eb509..c9f5175c58 100644 --- a/ext/oci8/tests/fetch_all2.phpt +++ b/ext/oci8/tests/fetch_all2.phpt @@ -16,7 +16,7 @@ $insert_sql = "INSERT INTO ".$schema."".$table_name." (id, value) VALUES (1,1)"; $s = oci_parse($c, $insert_sql); for ($i = 0; $i<3; $i++) { - oci_execute($s); + oci_execute($s); } oci_commit($c); diff --git a/ext/oci8/tests/fetch_all4.phpt b/ext/oci8/tests/fetch_all4.phpt index ff4f7c400e..039cb9ff47 100644 --- a/ext/oci8/tests/fetch_all4.phpt +++ b/ext/oci8/tests/fetch_all4.phpt @@ -10,9 +10,9 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "drop table fetch_all4_tab", - "create table fetch_all4_tab (mycol1 number, mycol2 varchar2(20))", - "insert into fetch_all4_tab values (1, 'abc')" + "drop table fetch_all4_tab", + "create table fetch_all4_tab (mycol1 number, mycol2 varchar2(20))", + "insert into fetch_all4_tab values (1, 'abc')" ); oci8_test_sql_execute($c, $stmtarray); @@ -39,14 +39,12 @@ var_dump($row); // Clean up $stmtarray = array( - "drop table fetch_all4_tab" + "drop table fetch_all4_tab" ); oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 int(0) @@ -60,4 +58,3 @@ array(2) { } Test 2 bool(false) -===DONE=== diff --git a/ext/oci8/tests/fetch_all5.phpt b/ext/oci8/tests/fetch_all5.phpt index 26c7447c2c..86d451c98b 100644 --- a/ext/oci8/tests/fetch_all5.phpt +++ b/ext/oci8/tests/fetch_all5.phpt @@ -10,11 +10,11 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "drop table fetch_all5_tab", - "create table fetch_all5_tab (mycol1 number, mycol2 varchar2(20))", - "insert into fetch_all5_tab values (1, 'abc')", - "insert into fetch_all5_tab values (2, 'def')", - "insert into fetch_all5_tab values (3, 'ghi')" + "drop table fetch_all5_tab", + "create table fetch_all5_tab (mycol1 number, mycol2 varchar2(20))", + "insert into fetch_all5_tab values (1, 'abc')", + "insert into fetch_all5_tab values (2, 'def')", + "insert into fetch_all5_tab values (3, 'ghi')" ); oci8_test_sql_execute($c, $stmtarray); @@ -48,7 +48,7 @@ var_dump($res); // Clean up $stmtarray = array( - "drop table fetch_all5_tab" + "drop table fetch_all5_tab" ); oci8_test_sql_execute($c, $stmtarray); @@ -56,8 +56,6 @@ oci8_test_sql_execute($c, $stmtarray); oci_close($c); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 int(3) @@ -107,4 +105,3 @@ Test 3 int(0) array(0) { } -===DONE=== diff --git a/ext/oci8/tests/fetch_array.phpt b/ext/oci8/tests/fetch_array.phpt index b7f327dcd4..ff74ad7673 100644 --- a/ext/oci8/tests/fetch_array.phpt +++ b/ext/oci8/tests/fetch_array.phpt @@ -14,17 +14,17 @@ require __DIR__.'/create_table.inc'; $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"); } for ($i = 0; $i<3; $i++) { - if (!oci_execute($s)) { - die("oci_execute(insert) failed!\n"); - } + if (!oci_execute($s)) { + die("oci_execute(insert) failed!\n"); + } } if (!oci_commit($c)) { - die("oci_commit() failed!\n"); + die("oci_commit() failed!\n"); } echo "Test 1\n"; @@ -32,68 +32,68 @@ echo "Test 1\n"; $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"); } if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } while ($row = oci_fetch_array($s)) { - var_dump($row); + var_dump($row); } echo "Test 2\n"; if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } while ($row = oci_fetch_array($s, OCI_NUM)) { - var_dump($row); + var_dump($row); } echo "Test 3\n"; if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } while ($row = oci_fetch_array($s, OCI_ASSOC)) { - var_dump($row); + var_dump($row); } echo "Test 4\n"; if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } while ($row = oci_fetch_array($s, OCI_BOTH)) { - var_dump($row); + var_dump($row); } echo "Test 5\n"; if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } while ($row = oci_fetch_array($s, OCI_RETURN_LOBS)) { - var_dump($row); + var_dump($row); } echo "Test 6\n"; if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } while ($row = oci_fetch_array($s, OCI_RETURN_NULLS)) { - var_dump($row); + var_dump($row); } echo "Test 7\n"; if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } while ($row = oci_fetch_array($s, OCI_NUM+OCI_RETURN_NULLS)) { - var_dump($row); + var_dump($row); } require __DIR__.'/drop_table.inc'; diff --git a/ext/oci8/tests/fetch_assoc.phpt b/ext/oci8/tests/fetch_assoc.phpt index e891858efa..bf0c1a0f18 100644 --- a/ext/oci8/tests/fetch_assoc.phpt +++ b/ext/oci8/tests/fetch_assoc.phpt @@ -8,11 +8,11 @@ oci_fetch_assoc() require __DIR__."/connect.inc"; $stmtarray = array( - "drop table fetch_assoc_tab", - "create table fetch_assoc_tab (id number, value number, dummy varchar2(20))", - "insert into fetch_assoc_tab values (1,1,null)", - "insert into fetch_assoc_tab values (1,1,null)", - "insert into fetch_assoc_tab values (1,1,null)" + "drop table fetch_assoc_tab", + "create table fetch_assoc_tab (id number, value number, dummy varchar2(20))", + "insert into fetch_assoc_tab values (1,1,null)", + "insert into fetch_assoc_tab values (1,1,null)", + "insert into fetch_assoc_tab values (1,1,null)" ); oci8_test_sql_execute($c, $stmtarray); @@ -20,20 +20,20 @@ oci8_test_sql_execute($c, $stmtarray); $select_sql = "select * from fetch_assoc_tab"; if (!($s = oci_parse($c, $select_sql))) { - die("oci_parse(select) failed!\n"); + die("oci_parse(select) failed!\n"); } if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } while ($row = oci_fetch_assoc($s)) { - var_dump($row); + var_dump($row); } // Clean up $stmtarray = array( - "drop table fetch_assoc_tab" + "drop table fetch_assoc_tab" ); oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/fetch_into.phpt b/ext/oci8/tests/fetch_into.phpt index 04f6743a75..634e7379ef 100644 --- a/ext/oci8/tests/fetch_into.phpt +++ b/ext/oci8/tests/fetch_into.phpt @@ -22,19 +22,19 @@ oci8_test_sql_execute($c, $stmtarray); // Run Test if (!($s = oci_parse($c, "select * from fetch_into_tab"))) { - die("oci_parse(select) failed!\n"); + die("oci_parse(select) failed!\n"); } /* ocifetchinto */ if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } var_dump(ocifetchinto($s, $all)); var_dump($all); /* ocifetchinto */ if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } var_dump(ocifetchinto($s, $all, OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS)); var_dump($all); diff --git a/ext/oci8/tests/fetch_into1.phpt b/ext/oci8/tests/fetch_into1.phpt index 97e511869e..27591eaa97 100644 --- a/ext/oci8/tests/fetch_into1.phpt +++ b/ext/oci8/tests/fetch_into1.phpt @@ -14,27 +14,27 @@ require __DIR__.'/create_table.inc'; $insert_sql = "INSERT INTO ".$schema."".$table_name." (id, value, string) VALUES (1, 1, NULL)"; if (!($s = oci_parse($c, $insert_sql))) { - die("oci_parse(insert) failed!\n"); + die("oci_parse(insert) failed!\n"); } for ($i = 0; $i<20; $i++) { - if (!oci_execute($s)) { - die("oci_execute(insert) failed!\n"); - } + if (!oci_execute($s)) { + die("oci_execute(insert) failed!\n"); + } } if (!oci_commit($c)) { - die("oci_commit() failed!\n"); + die("oci_commit() failed!\n"); } $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"); } if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } var_dump(ocifetchinto($s, $all, OCI_NUM)); var_dump($all); diff --git a/ext/oci8/tests/fetch_into2.phpt b/ext/oci8/tests/fetch_into2.phpt index b79e282350..13467e0e54 100644 --- a/ext/oci8/tests/fetch_into2.phpt +++ b/ext/oci8/tests/fetch_into2.phpt @@ -14,27 +14,27 @@ require __DIR__.'/create_table.inc'; $insert_sql = "INSERT INTO ".$schema."".$table_name." (id, value, string) VALUES (1, 1, NULL)"; if (!($s = oci_parse($c, $insert_sql))) { - die("oci_parse(insert) failed!\n"); + die("oci_parse(insert) failed!\n"); } for ($i = 0; $i<20; $i++) { - if (!oci_execute($s)) { - die("oci_execute(insert) failed!\n"); - } + if (!oci_execute($s)) { + die("oci_execute(insert) failed!\n"); + } } if (!oci_commit($c)) { - die("oci_commit() failed!\n"); + die("oci_commit() failed!\n"); } $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"); } if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } var_dump(ocifetchinto($s)); var_dump($all); @@ -53,7 +53,7 @@ echo "Done\n"; Warning: ocifetchinto() expects at least 2 parameters, 1 given in %s on line %d NULL -Notice: Undefined variable: all in %s on line %d +Notice: Undefined variable $all in %s on line %d NULL Warning: ocifetchinto() expects at most 3 parameters, 4 given in %s on line %d diff --git a/ext/oci8/tests/fetch_object.phpt b/ext/oci8/tests/fetch_object.phpt index 053b3136f3..1e270b6000 100644 --- a/ext/oci8/tests/fetch_object.phpt +++ b/ext/oci8/tests/fetch_object.phpt @@ -77,8 +77,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 object(stdClass)#1 (3) { @@ -120,4 +118,3 @@ Test 3 Notice: Undefined property: stdClass::$CASESENSITIVE in %sfetch_object.php on line %d -===DONE=== diff --git a/ext/oci8/tests/fetch_object_1.phpt b/ext/oci8/tests/fetch_object_1.phpt index 3480aa25b1..586daebca8 100644 --- a/ext/oci8/tests/fetch_object_1.phpt +++ b/ext/oci8/tests/fetch_object_1.phpt @@ -77,8 +77,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 object(stdClass)#%d (3) { @@ -120,4 +118,3 @@ Test 3 Notice: Undefined property: stdClass::$CASESENSITIVE in %sfetch_object_1.php on line %d -===DONE=== diff --git a/ext/oci8/tests/fetch_object_2.phpt b/ext/oci8/tests/fetch_object_2.phpt index 648d1dd073..8d8c334182 100644 --- a/ext/oci8/tests/fetch_object_2.phpt +++ b/ext/oci8/tests/fetch_object_2.phpt @@ -63,8 +63,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 object(stdClass)#%d (3) { @@ -110,4 +108,3 @@ Test 2 789 3rd row col2 string 3 more text -===DONE=== diff --git a/ext/oci8/tests/fetch_row.phpt b/ext/oci8/tests/fetch_row.phpt index b50b65d480..6dcc1f2c5c 100644 --- a/ext/oci8/tests/fetch_row.phpt +++ b/ext/oci8/tests/fetch_row.phpt @@ -22,14 +22,14 @@ oci8_test_sql_execute($c, $stmtarray); // Run Test if (!($s = oci_parse($c, "select * from fetch_row_tab"))) { - die("oci_parse(select) failed!\n"); + die("oci_parse(select) failed!\n"); } if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } while ($row = oci_fetch_row($s)) { - var_dump($row); + var_dump($row); } // Cleanup diff --git a/ext/oci8/tests/field_funcs.phpt b/ext/oci8/tests/field_funcs.phpt index 1432dcd4c0..76ff3d4f9f 100644 --- a/ext/oci8/tests/field_funcs.phpt +++ b/ext/oci8/tests/field_funcs.phpt @@ -14,41 +14,41 @@ require __DIR__.'/create_table.inc'; $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"); } for ($i = 0; $i<3; $i++) { - if (!oci_execute($s)) { - die("oci_execute(insert) failed!\n"); - } + if (!oci_execute($s)) { + die("oci_execute(insert) failed!\n"); + } } if (!oci_commit($c)) { - die("oci_commit() failed!\n"); + die("oci_commit() failed!\n"); } $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"); } if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } $row = oci_fetch_array($s, OCI_NUM + OCI_RETURN_NULLS + OCI_RETURN_LOBS); var_dump($row); foreach ($row as $num => $field) { - $num++; - var_dump(oci_field_is_null($s, $num)); - var_dump(oci_field_name($s, $num)); - var_dump(oci_field_type($s, $num)); - var_dump(oci_field_type_raw($s, $num)); - var_dump(oci_field_scale($s, $num)); - var_dump(oci_field_precision($s, $num)); - var_dump(oci_field_size($s, $num)); + $num++; + var_dump(oci_field_is_null($s, $num)); + var_dump(oci_field_name($s, $num)); + var_dump(oci_field_type($s, $num)); + var_dump(oci_field_type_raw($s, $num)); + var_dump(oci_field_scale($s, $num)); + var_dump(oci_field_precision($s, $num)); + var_dump(oci_field_size($s, $num)); } diff --git a/ext/oci8/tests/field_funcs2.phpt b/ext/oci8/tests/field_funcs2.phpt index 896a63d11b..623bc3d835 100644 --- a/ext/oci8/tests/field_funcs2.phpt +++ b/ext/oci8/tests/field_funcs2.phpt @@ -11,26 +11,26 @@ $s = oci_parse($c, 'drop table field_funcs2_tab'); @oci_execute($s); $t = array("C01" => "NUMBER", - "C02" => "NUMBER(*,1)", - "C03" => "NUMBER(9)", - "C04" => "NUMBER(9,2)", - "C05" => "NUMBER(9,1)", - "C06" => "NUMBER(7,-2)", - "C07" => "DECIMAL(4,9)", - "C08" => "NUMERIC(4,9)", - "C09" => "DECIMAL(4)", - "C10" => "INTEGER", - "C11" => "INT", - "C12" => "SMALLINT", - "C13" => "FLOAT", - "C14" => "FLOAT(9)", - "C15" => "DOUBLE PRECISION", - "C16" => "REAL", - ); + "C02" => "NUMBER(*,1)", + "C03" => "NUMBER(9)", + "C04" => "NUMBER(9,2)", + "C05" => "NUMBER(9,1)", + "C06" => "NUMBER(7,-2)", + "C07" => "DECIMAL(4,9)", + "C08" => "NUMERIC(4,9)", + "C09" => "DECIMAL(4)", + "C10" => "INTEGER", + "C11" => "INT", + "C12" => "SMALLINT", + "C13" => "FLOAT", + "C14" => "FLOAT(9)", + "C15" => "DOUBLE PRECISION", + "C16" => "REAL", + ); $stmt = "create table field_funcs2_tab (\n"; foreach ($t as $colname => $type) { - $stmt .= "$colname $type,\n"; + $stmt .= "$colname $type,\n"; } $stmt[strlen($stmt)-2] = ")"; @@ -41,10 +41,10 @@ $s = oci_parse($c, "select * from field_funcs2_tab"); oci_execute($s); for ($i = 1; $i <= oci_num_fields($s); $i++) { - $name = oci_field_name($s, $i); - $precision = oci_field_precision($s, $i); - $scale = oci_field_scale($s, $i); - echo "$name ".$t[$name] .": precision $precision, scale $scale\n"; + $name = oci_field_name($s, $i); + $precision = oci_field_precision($s, $i); + $scale = oci_field_scale($s, $i); + echo "$name ".$t[$name] .": precision $precision, scale $scale\n"; } echo "Done\n"; diff --git a/ext/oci8/tests/field_funcs3.phpt b/ext/oci8/tests/field_funcs3.phpt index 23f4b5ea61..75d050321e 100644 --- a/ext/oci8/tests/field_funcs3.phpt +++ b/ext/oci8/tests/field_funcs3.phpt @@ -25,38 +25,36 @@ oci8_test_sql_execute($c, $stmtarray); $select_sql = "select * from field_funcs3_tab"; if (!($s = oci_parse($c, $select_sql))) { - die("oci_parse(select) failed!\n"); + die("oci_parse(select) failed!\n"); } if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } $row = oci_fetch_array($s, OCI_NUM + OCI_RETURN_NULLS + OCI_RETURN_LOBS); var_dump($row); foreach ($row as $num => $field) { - $num++; - var_dump(oci_field_is_null($s, $num)); - var_dump(oci_field_name($s, $num)); - var_dump(oci_field_type($s, $num)); - var_dump(oci_field_type_raw($s, $num)); - var_dump(oci_field_scale($s, $num)); - var_dump(oci_field_precision($s, $num)); - var_dump(oci_field_size($s, $num)); + $num++; + var_dump(oci_field_is_null($s, $num)); + var_dump(oci_field_name($s, $num)); + var_dump(oci_field_type($s, $num)); + var_dump(oci_field_type_raw($s, $num)); + var_dump(oci_field_scale($s, $num)); + var_dump(oci_field_precision($s, $num)); + var_dump(oci_field_size($s, $num)); } // Clean up $stmtarray = array( - "drop table field_funcs3_tab" + "drop table field_funcs3_tab" ); oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- array(4) { [0]=> @@ -96,4 +94,3 @@ int(12) int(0) int(0) int(7) -===DONE=== diff --git a/ext/oci8/tests/field_funcs_old.phpt b/ext/oci8/tests/field_funcs_old.phpt index 6417de15cd..afb6dc62e1 100644 --- a/ext/oci8/tests/field_funcs_old.phpt +++ b/ext/oci8/tests/field_funcs_old.phpt @@ -14,41 +14,41 @@ require __DIR__.'/create_table.inc'; $insert_sql = "INSERT INTO ".$schema."".$table_name." (id, value) VALUES (1,1)"; if (!($s = ociparse($c, $insert_sql))) { - die("ociparse(insert) failed!\n"); + die("ociparse(insert) failed!\n"); } for ($i = 0; $i<3; $i++) { - if (!ociexecute($s)) { - die("ociexecute(insert) failed!\n"); - } + if (!ociexecute($s)) { + die("ociexecute(insert) failed!\n"); + } } if (!ocicommit($c)) { - die("ocicommit() failed!\n"); + die("ocicommit() failed!\n"); } $select_sql = "SELECT * FROM ".$schema."".$table_name.""; if (!($s = ociparse($c, $select_sql))) { - die("ociparse(select) failed!\n"); + die("ociparse(select) failed!\n"); } if (!ociexecute($s)) { - die("ociexecute(select) failed!\n"); + die("ociexecute(select) failed!\n"); } ocifetchinto($s, $row, OCI_NUM + OCI_RETURN_NULLS + OCI_RETURN_LOBS); var_dump($row); foreach ($row as $num => $field) { - $num++; - var_dump(ocicolumnisnull($s, $num)); - var_dump(ocicolumnname($s, $num)); - var_dump(ocicolumntype($s, $num)); - var_dump(ocicolumntyperaw($s, $num)); - var_dump(ocicolumnscale($s, $num)); - var_dump(ocicolumnprecision($s, $num)); - var_dump(ocicolumnsize($s, $num)); + $num++; + var_dump(ocicolumnisnull($s, $num)); + var_dump(ocicolumnname($s, $num)); + var_dump(ocicolumntype($s, $num)); + var_dump(ocicolumntyperaw($s, $num)); + var_dump(ocicolumnscale($s, $num)); + var_dump(ocicolumnprecision($s, $num)); + var_dump(ocicolumnsize($s, $num)); } diff --git a/ext/oci8/tests/imp_res_1.phpt b/ext/oci8/tests/imp_res_1.phpt index 7379b606f2..28725fdd17 100644 --- a/ext/oci8/tests/imp_res_1.phpt +++ b/ext/oci8/tests/imp_res_1.phpt @@ -117,8 +117,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 - oci_fetch_assoc array(2) { @@ -627,4 +625,3 @@ array(4) { ["C2"]=> string(5) "klmno" } -===DONE=== diff --git a/ext/oci8/tests/imp_res_2.phpt b/ext/oci8/tests/imp_res_2.phpt index b246e2ed77..8f7abdadd8 100644 --- a/ext/oci8/tests/imp_res_2.phpt +++ b/ext/oci8/tests/imp_res_2.phpt @@ -82,8 +82,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 Test 2 @@ -96,4 +94,3 @@ array(1) { [0]=> string(1) "X" } -===DONE=== diff --git a/ext/oci8/tests/imp_res_3.phpt b/ext/oci8/tests/imp_res_3.phpt index bd48267e96..d7f4debef9 100644 --- a/ext/oci8/tests/imp_res_3.phpt +++ b/ext/oci8/tests/imp_res_3.phpt @@ -80,8 +80,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 1 a 1 a 1 a 1 a 1 a @@ -1254,4 +1252,3 @@ Test 1 v w X -===DONE=== diff --git a/ext/oci8/tests/imp_res_4.phpt b/ext/oci8/tests/imp_res_4.phpt index 79e9b39dd3..b4bff4ae36 100644 --- a/ext/oci8/tests/imp_res_4.phpt +++ b/ext/oci8/tests/imp_res_4.phpt @@ -59,8 +59,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 @@ -79,4 +77,3 @@ array(1) { [0]=> string(1) "2" } -===DONE=== diff --git a/ext/oci8/tests/imp_res_5.phpt b/ext/oci8/tests/imp_res_5.phpt index 26107eda94..ca611acaeb 100644 --- a/ext/oci8/tests/imp_res_5.phpt +++ b/ext/oci8/tests/imp_res_5.phpt @@ -59,8 +59,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 @@ -81,4 +79,3 @@ array(1) { [0]=> string(1) "2" } -===DONE=== diff --git a/ext/oci8/tests/imp_res_6.phpt b/ext/oci8/tests/imp_res_6.phpt index c1ea7d34f3..d1734b9e59 100644 --- a/ext/oci8/tests/imp_res_6.phpt +++ b/ext/oci8/tests/imp_res_6.phpt @@ -71,8 +71,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 array(2) { @@ -115,4 +113,3 @@ array(2) { ["C2"]=> string(1) "f" } -===DONE=== diff --git a/ext/oci8/tests/imp_res_7.phpt b/ext/oci8/tests/imp_res_7.phpt index 6ba9d5fc14..a4b86ceb46 100644 --- a/ext/oci8/tests/imp_res_7.phpt +++ b/ext/oci8/tests/imp_res_7.phpt @@ -591,8 +591,6 @@ while (($row = oci_fetch_row($s)) != false) { } ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 1 @@ -870,4 +868,3 @@ Test 1 273 274 275 -===DONE=== diff --git a/ext/oci8/tests/imp_res_call_error.phpt b/ext/oci8/tests/imp_res_call_error.phpt index 5c2ab9988a..503bef6728 100644 --- a/ext/oci8/tests/imp_res_call_error.phpt +++ b/ext/oci8/tests/imp_res_call_error.phpt @@ -49,8 +49,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 @@ -58,4 +56,3 @@ Warning: oci_execute(): ORA-29478: %s ORA-06512: at "SYS.DBMS_SQL", line %d ORA-06512: at "SYS.DBMS_SQL", line %d ORA-06512: at "%s.IMP_RES_CALL_ERR_PROC", line %d in %simp_res_call_error.php on line %d -===DONE=== diff --git a/ext/oci8/tests/imp_res_cancel.phpt b/ext/oci8/tests/imp_res_cancel.phpt index e3caa86672..54c6784ea8 100644 --- a/ext/oci8/tests/imp_res_cancel.phpt +++ b/ext/oci8/tests/imp_res_cancel.phpt @@ -55,8 +55,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 1 @@ -65,4 +63,3 @@ bool(true) bool(true) 3 bool(true) -===DONE=== diff --git a/ext/oci8/tests/imp_res_close.phpt b/ext/oci8/tests/imp_res_close.phpt index 3e719b9ee2..4bd7fcb68a 100644 --- a/ext/oci8/tests/imp_res_close.phpt +++ b/ext/oci8/tests/imp_res_close.phpt @@ -58,11 +58,8 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 1 Warning: oci_fetch_array(): supplied resource is not a valid oci8 statement resource in %simp_res_close.php on line %d -===DONE=== diff --git a/ext/oci8/tests/imp_res_cursor.phpt b/ext/oci8/tests/imp_res_cursor.phpt index 221ef80d47..4aba076bb2 100644 --- a/ext/oci8/tests/imp_res_cursor.phpt +++ b/ext/oci8/tests/imp_res_cursor.phpt @@ -85,8 +85,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 X @@ -96,4 +94,3 @@ Test 1 t u -===DONE=== diff --git a/ext/oci8/tests/imp_res_dbmsoutput.phpt b/ext/oci8/tests/imp_res_dbmsoutput.phpt index b84ef8c556..186c522f41 100644 --- a/ext/oci8/tests/imp_res_dbmsoutput.phpt +++ b/ext/oci8/tests/imp_res_dbmsoutput.phpt @@ -103,8 +103,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 array(2) { @@ -133,4 +131,3 @@ array(2) { [1]=> string(18) "dbms_output Line 2" } -===DONE=== diff --git a/ext/oci8/tests/imp_res_field.phpt b/ext/oci8/tests/imp_res_field.phpt index c96e7c3ef5..9280e4f7c0 100644 --- a/ext/oci8/tests/imp_res_field.phpt +++ b/ext/oci8/tests/imp_res_field.phpt @@ -124,8 +124,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 - can't get IRS fields from parent num fields : 0 @@ -224,4 +222,3 @@ array(1) { } num fields : 1 C4_NUMBER52 : is_null T, precision 5, scale 2, size 22, typeraw 2, type NUMBER -===DONE=== diff --git a/ext/oci8/tests/imp_res_func_error.phpt b/ext/oci8/tests/imp_res_func_error.phpt index 424ae47bb8..705d3ca89c 100644 --- a/ext/oci8/tests/imp_res_func_error.phpt +++ b/ext/oci8/tests/imp_res_func_error.phpt @@ -55,8 +55,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 @@ -64,4 +62,3 @@ Warning: oci_execute(): ORA-29478: %s ORA-06512: %s ORA-06512: %s ORA-06512: %s -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_1.phpt b/ext/oci8/tests/imp_res_get_1.phpt index 7eac1033f4..5b7cad4036 100644 --- a/ext/oci8/tests/imp_res_get_1.phpt +++ b/ext/oci8/tests/imp_res_get_1.phpt @@ -88,8 +88,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 1 abcde @@ -106,4 +104,3 @@ Test 2 - with execute t u X -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_2.phpt b/ext/oci8/tests/imp_res_get_2.phpt index b8c2a08af5..2966412e16 100644 --- a/ext/oci8/tests/imp_res_get_2.phpt +++ b/ext/oci8/tests/imp_res_get_2.phpt @@ -94,8 +94,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 1 abcde @@ -104,4 +102,3 @@ Test 1 t u X -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_3.phpt b/ext/oci8/tests/imp_res_get_3.phpt index 4b39dd1117..f12d740aac 100644 --- a/ext/oci8/tests/imp_res_get_3.phpt +++ b/ext/oci8/tests/imp_res_get_3.phpt @@ -80,8 +80,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 1 abcde @@ -264,4 +262,3 @@ Test 1 t u X -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_4.phpt b/ext/oci8/tests/imp_res_get_4.phpt index 193e2f623e..03125029ed 100644 --- a/ext/oci8/tests/imp_res_get_4.phpt +++ b/ext/oci8/tests/imp_res_get_4.phpt @@ -118,8 +118,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 1 abcde @@ -143,4 +141,3 @@ Return is false Warning: oci_fetch_array(): ORA-01002: %s in %simp_res_get_4.php on line %d Return is false -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_5.phpt b/ext/oci8/tests/imp_res_get_5.phpt index 79bb170a59..dca564b4f0 100644 --- a/ext/oci8/tests/imp_res_get_5.phpt +++ b/ext/oci8/tests/imp_res_get_5.phpt @@ -93,8 +93,6 @@ while (($row = oci_fetch_row($s)) != false) { // parent oci_free_statement($s); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 3 @@ -121,4 +119,3 @@ Test 3 - fetch part of IRS explicitly Test 4 - skip IRSs 5 6 -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_all.phpt b/ext/oci8/tests/imp_res_get_all.phpt index a1d99eeebf..cfc883e9d3 100644 --- a/ext/oci8/tests/imp_res_get_all.phpt +++ b/ext/oci8/tests/imp_res_get_all.phpt @@ -57,8 +57,6 @@ while (($s1 = oci_get_implicit_resultset($s))) { } ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 array(1) { @@ -117,4 +115,3 @@ array(1) { string(1) "6" } } -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_cancel.phpt b/ext/oci8/tests/imp_res_get_cancel.phpt index 5bc36f08cd..dee5625502 100644 --- a/ext/oci8/tests/imp_res_get_cancel.phpt +++ b/ext/oci8/tests/imp_res_get_cancel.phpt @@ -46,10 +46,7 @@ while (($s1 = oci_get_implicit_resultset($s))) { } ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 1 3 -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_close_1.phpt b/ext/oci8/tests/imp_res_get_close_1.phpt index a9c2fc455c..0aef8577c2 100644 --- a/ext/oci8/tests/imp_res_get_close_1.phpt +++ b/ext/oci8/tests/imp_res_get_close_1.phpt @@ -52,8 +52,6 @@ while (($s1 = oci_get_implicit_resultset($s))) { oci_free_statement($s); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 1 @@ -65,4 +63,3 @@ Warning: oci_fetch_array(): supplied resource is not a valid oci8 statement reso 5 Warning: oci_fetch_array(): supplied resource is not a valid oci8 statement resource in %s on line %d -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_close_2.phpt b/ext/oci8/tests/imp_res_get_close_2.phpt index d435b8968d..9a0693105c 100644 --- a/ext/oci8/tests/imp_res_get_close_2.phpt +++ b/ext/oci8/tests/imp_res_get_close_2.phpt @@ -51,8 +51,6 @@ while (($s1 = oci_get_implicit_resultset($s))) { } ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 1 @@ -60,4 +58,3 @@ Test 1 Warning: oci_fetch_array(): OCI_INVALID_HANDLE in %s on line %d Warning: oci_get_implicit_resultset(): supplied resource is not a valid oci8 statement resource in %s on line %d -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_close_3.phpt b/ext/oci8/tests/imp_res_get_close_3.phpt index 268c353801..36d8c50d06 100644 --- a/ext/oci8/tests/imp_res_get_close_3.phpt +++ b/ext/oci8/tests/imp_res_get_close_3.phpt @@ -52,8 +52,6 @@ while (($s1 = oci_get_implicit_resultset($s))) { oci_free_statement($s); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 1 @@ -62,4 +60,3 @@ Test 1 4 5 6 -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_cursor.phpt b/ext/oci8/tests/imp_res_get_cursor.phpt index 1694fc830a..29742e465e 100644 --- a/ext/oci8/tests/imp_res_get_cursor.phpt +++ b/ext/oci8/tests/imp_res_get_cursor.phpt @@ -87,8 +87,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 1 abcde @@ -98,4 +96,3 @@ Test 1 t u X -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_dbmsoutput.phpt b/ext/oci8/tests/imp_res_get_dbmsoutput.phpt index 95bb50cd51..52e289ca7d 100644 --- a/ext/oci8/tests/imp_res_get_dbmsoutput.phpt +++ b/ext/oci8/tests/imp_res_get_dbmsoutput.phpt @@ -117,8 +117,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 array(3) { @@ -152,4 +150,3 @@ array(3) { [2]=> string(6) "Line 3" } -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_exec.phpt b/ext/oci8/tests/imp_res_get_exec.phpt index f9391cc122..d0b9028a03 100644 --- a/ext/oci8/tests/imp_res_get_exec.phpt +++ b/ext/oci8/tests/imp_res_get_exec.phpt @@ -46,10 +46,7 @@ oci_free_statement($s); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 1 2 -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_none.phpt b/ext/oci8/tests/imp_res_get_none.phpt index 87d86c2f9f..a8d92d7326 100644 --- a/ext/oci8/tests/imp_res_get_none.phpt +++ b/ext/oci8/tests/imp_res_get_none.phpt @@ -38,9 +38,6 @@ while (($s1 = oci_get_implicit_resultset($s))) { var_dump($s1); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 bool(false) -===DONE=== diff --git a/ext/oci8/tests/imp_res_insert.phpt b/ext/oci8/tests/imp_res_insert.phpt index 074f5ee879..21c7820506 100644 --- a/ext/oci8/tests/imp_res_insert.phpt +++ b/ext/oci8/tests/imp_res_insert.phpt @@ -103,8 +103,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 - No commit in procedure, OCI_COMMIT_ON_SUCCESS mode 111 @@ -149,4 +147,3 @@ array(4) { [3]=> string(3) "444" } -===DONE=== diff --git a/ext/oci8/tests/imp_res_lob.phpt b/ext/oci8/tests/imp_res_lob.phpt index 48185b6355..6673761688 100644 --- a/ext/oci8/tests/imp_res_lob.phpt +++ b/ext/oci8/tests/imp_res_lob.phpt @@ -82,8 +82,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 1 aaaaa a @@ -98,4 +96,3 @@ Test 1 Test 2 - don't fetch all rows 1 aaaaa a -===DONE=== diff --git a/ext/oci8/tests/imp_res_prefetch.phpt b/ext/oci8/tests/imp_res_prefetch.phpt index 849874bd00..6425697f7b 100644 --- a/ext/oci8/tests/imp_res_prefetch.phpt +++ b/ext/oci8/tests/imp_res_prefetch.phpt @@ -81,8 +81,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 - prefetch 0 bool(true) @@ -182,4 +180,3 @@ array(1) { [0]=> string(1) "v" } -===DONE=== diff --git a/ext/oci8/tests/ini_1.phpt b/ext/oci8/tests/ini_1.phpt index 9c9b378e7b..3c306a65d3 100644 --- a/ext/oci8/tests/ini_1.phpt +++ b/ext/oci8/tests/ini_1.phpt @@ -53,8 +53,6 @@ var_dump(ini_set('oci8.old_oci_close_semantics', 'Off')); echo 'oci8.old_oci_close_semantics = ' . ini_get('oci8.old_oci_close_semantics') . "\n"; ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 - check initialization oci8.privileged_connect = 1 @@ -85,4 +83,3 @@ bool(false) oci8.default_prefetch = 555 bool(false) oci8.old_oci_close_semantics = 1 -===DONE=== diff --git a/ext/oci8/tests/lob_001.phpt b/ext/oci8/tests/lob_001.phpt Binary files differindex 3a3a48dee0..3e9c061ee0 100644 --- a/ext/oci8/tests/lob_001.phpt +++ b/ext/oci8/tests/lob_001.phpt diff --git a/ext/oci8/tests/lob_002.phpt b/ext/oci8/tests/lob_002.phpt index e83ae21187..426ab91cba 100644 --- a/ext/oci8/tests/lob_002.phpt +++ b/ext/oci8/tests/lob_002.phpt @@ -13,8 +13,8 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "drop table lob_002_tab", - "create table lob_002_tab (id number, b1 BLOB)", + "drop table lob_002_tab", + "create table lob_002_tab (id number, b1 BLOB)", ); oci8_test_sql_execute($c, $stmtarray); @@ -47,14 +47,12 @@ var_dump(strlen($row[0])); // Cleanup $stmtarray = array( - "drop table lob_002_tab" + "drop table lob_002_tab" ); oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- object(OCI-Lob)#%d (1) { ["descriptor"]=> @@ -62,14 +60,13 @@ object(OCI-Lob)#%d (1) { } int(0) -Warning: OCI-Lob::write() expects parameter 2 to be int%s string given in %slob_002.php on line %d +Warning: OCI-Lob::write(): Argument #2 must be of type int%s string given in %slob_002.php on line %d NULL int(4) int(40000) int(40004) -Warning: OCI-Lob::seek() expects parameter 1 to be int%s string given in %slob_002.php on line %d +Warning: OCI-Lob::seek(): Argument #1 must be of type int%s string given in %slob_002.php on line %d NULL bool(false) int(40004) -===DONE=== diff --git a/ext/oci8/tests/lob_008.phpt b/ext/oci8/tests/lob_008.phpt index 53b75302ef..57fce95130 100644 --- a/ext/oci8/tests/lob_008.phpt +++ b/ext/oci8/tests/lob_008.phpt @@ -37,7 +37,7 @@ var_dump($row = oci_fetch_array($s)); $len = 0; while (!$row[0]->eof()) { - $len += strlen($row[0]->read(1024)); + $len += strlen($row[0]->read(1024)); } var_dump($len); diff --git a/ext/oci8/tests/lob_009.phpt b/ext/oci8/tests/lob_009.phpt index 090503f927..56d2495a62 100644 --- a/ext/oci8/tests/lob_009.phpt +++ b/ext/oci8/tests/lob_009.phpt @@ -35,7 +35,7 @@ oci_execute($s, OCI_DEFAULT); var_dump($row = oci_fetch_array($s)); while (!$row[0]->eof()) { - var_dump(str_replace("\r", "", $row[0]->read(1024))); + var_dump(str_replace("\r", "", $row[0]->read(1024))); } require __DIR__.'/drop_table.inc'; diff --git a/ext/oci8/tests/lob_010.phpt b/ext/oci8/tests/lob_010.phpt index b4a0a77d1e..50924e5516 100644 --- a/ext/oci8/tests/lob_010.phpt +++ b/ext/oci8/tests/lob_010.phpt @@ -34,7 +34,7 @@ oci_execute($s, OCI_DEFAULT); $row = oci_fetch_array($s); while (!$row[0]->eof()) { - var_dump($row[0]->read(1024)); + var_dump($row[0]->read(1024)); } require __DIR__.'/drop_table.inc'; diff --git a/ext/oci8/tests/lob_018.phpt b/ext/oci8/tests/lob_018.phpt index be678728f0..2feab1a3f3 100644 --- a/ext/oci8/tests/lob_018.phpt +++ b/ext/oci8/tests/lob_018.phpt @@ -13,8 +13,8 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "drop table lob_018_tab", - "create table lob_018_tab (mykey number, lob_1 clob)", + "drop table lob_018_tab", + "create table lob_018_tab (mykey number, lob_1 clob)", ); oci8_test_sql_execute($c, $stmtarray); @@ -45,8 +45,8 @@ $statement = oci_parse ($c, $query); oci_execute($statement, OCI_DEFAULT); while ($row = oci_fetch_array($statement, OCI_ASSOC)) { - $result = $row['LOB_1']->load(); - var_dump($result); + $result = $row['LOB_1']->load(); + var_dump($result); } echo "Test 2\n"; @@ -56,8 +56,8 @@ $statement = oci_parse ($c, $query); oci_execute($statement, OCI_DEFAULT); while ($row = oci_fetch_array($statement, OCI_ASSOC)) { - $result = $row['LOB_1']->load(); - var_dump($result); + $result = $row['LOB_1']->load(); + var_dump($result); } echo "Test 3 - bind with SQLT_CLOB (an alias for OCI_B_CLOB)\n"; @@ -76,8 +76,8 @@ $statement = oci_parse ($c, $query); oci_execute($statement, OCI_DEFAULT); while ($row = oci_fetch_array($statement, OCI_ASSOC)) { - $result = $row['LOB_1']->load(); - var_dump($result); + $result = $row['LOB_1']->load(); + var_dump($result); } // Cleanup @@ -89,8 +89,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 string(4) "data" @@ -100,4 +98,3 @@ string(9) "long data" string(4) "data" Test 3 - bind with SQLT_CLOB (an alias for OCI_B_CLOB) string(10) "more stuff" -===DONE=== diff --git a/ext/oci8/tests/lob_021.phpt b/ext/oci8/tests/lob_021.phpt index 609003603b..3fbf4fab5a 100644 --- a/ext/oci8/tests/lob_021.phpt +++ b/ext/oci8/tests/lob_021.phpt @@ -61,7 +61,7 @@ bool(false) Warning: oci_free_descriptor(): %s is not a valid oci8 descriptor resource in %s on line %d bool(false) -Warning: oci_free_descriptor() expects parameter 1 to be OCI-Lob, object given in %s on line %d +Warning: oci_free_descriptor(): Argument #1 must be of type OCI-Lob, object given in %s on line %d NULL Warning: oci_free_descriptor(): Unable to find descriptor property in %s on line %d diff --git a/ext/oci8/tests/lob_022.phpt b/ext/oci8/tests/lob_022.phpt index 3de78dcd2a..e353eda526 100644 --- a/ext/oci8/tests/lob_022.phpt +++ b/ext/oci8/tests/lob_022.phpt @@ -48,8 +48,8 @@ $statement = oci_parse ($c, $query); oci_execute($statement, OCI_DEFAULT); while ($row = oci_fetch_array($statement, OCI_ASSOC)) { - $result = $row['LOB_1']->load(); - var_dump($result); + $result = $row['LOB_1']->load(); + var_dump($result); } $query = 'SELECT * FROM lob_test ORDER BY mykey DESC'; @@ -57,8 +57,8 @@ $statement = oci_parse ($c, $query); oci_execute($statement, OCI_DEFAULT); while ($row = oci_fetch_array($statement, OCI_ASSOC)) { - $result = $row['LOB_1']->load(); - var_dump($result); + $result = $row['LOB_1']->load(); + var_dump($result); } $drop = "DROP table lob_test"; diff --git a/ext/oci8/tests/lob_023.phpt b/ext/oci8/tests/lob_023.phpt index 8093ab63af..f8b295a441 100644 --- a/ext/oci8/tests/lob_023.phpt +++ b/ext/oci8/tests/lob_023.phpt @@ -40,7 +40,7 @@ oci_execute($s, OCI_DEFAULT); var_dump($row = oci_fetch_array($s)); while (!$row[0]->eof()) { - var_dump(str_replace("\r", "", $row[0]->read(1024))); + var_dump(str_replace("\r", "", $row[0]->read(1024))); } require __DIR__.'/drop_table.inc'; diff --git a/ext/oci8/tests/lob_026.phpt b/ext/oci8/tests/lob_026.phpt index acada8a9d3..301a8f4b62 100644 --- a/ext/oci8/tests/lob_026.phpt +++ b/ext/oci8/tests/lob_026.phpt @@ -73,7 +73,7 @@ NULL bool(true) int(3) -Warning: oci_lob_seek() expects parameter 1 to be OCI-Lob, int%sgiven in %s on line %d +Warning: oci_lob_seek(): Argument #1 must be of type OCI-Lob, int%sgiven in %s on line %d NULL bool(true) array(2) { diff --git a/ext/oci8/tests/lob_027.phpt b/ext/oci8/tests/lob_027.phpt index ec759ccb0a..ccea9b30cb 100644 --- a/ext/oci8/tests/lob_027.phpt +++ b/ext/oci8/tests/lob_027.phpt @@ -39,15 +39,15 @@ oci_commit($c); for ($i = 5; $i >= 0; $i--) { - $select_sql = "SELECT blob FROM ".$schema.$table_name." FOR UPDATE"; - $s = oci_parse($c, $select_sql); - oci_execute($s, OCI_DEFAULT); + $select_sql = "SELECT blob FROM ".$schema.$table_name." FOR UPDATE"; + $s = oci_parse($c, $select_sql); + oci_execute($s, OCI_DEFAULT); - $row = oci_fetch_array($s); - var_dump($row['BLOB']->load()); - var_dump($row['BLOB']->truncate(($i-1)*10)); + $row = oci_fetch_array($s); + var_dump($row['BLOB']->load()); + var_dump($row['BLOB']->truncate(($i-1)*10)); - oci_commit($c); + oci_commit($c); } $select_sql = "SELECT blob FROM ".$schema.$table_name." FOR UPDATE"; diff --git a/ext/oci8/tests/lob_040.phpt b/ext/oci8/tests/lob_040.phpt index 2c0d361a59..3711c4b54d 100644 --- a/ext/oci8/tests/lob_040.phpt +++ b/ext/oci8/tests/lob_040.phpt @@ -14,8 +14,8 @@ require(__DIR__.'/connect.inc'); require(__DIR__.'/create_table.inc'); for ($i = 0; $i < NUMLOBS; $i++) { - $s = oci_parse($c, "insert into ".$schema.$table_name." (id, clob) values(".$i.", '".$i."aaaa".$i.$i."aaaaaaaaaaaaaaaaaaaaaaaaaaaz')"); - oci_execute($s); + $s = oci_parse($c, "insert into ".$schema.$table_name." (id, clob) values(".$i.", '".$i."aaaa".$i.$i."aaaaaaaaaaaaaaaaaaaaaaaaaaaz')"); + oci_execute($s); } echo "Test 1: CLOB as locator\n"; @@ -25,15 +25,15 @@ oci_execute($s); $row = array(); for ($i = 0; $i < NUMLOBS; $i++) { - $row[$i] = oci_fetch_array($s, OCI_NUM); + $row[$i] = oci_fetch_array($s, OCI_NUM); } for ($i = 0; $i < NUMLOBS; $i++) { - echo "Row $i Size: " . $row[$i][0]->size() . "\n"; - echo "Pos 1: " . $row[$i][0]->tell() . "\n"; - echo "Data: " . $row[$i][0]->read(5) . "\n"; - echo "Pos 2: " . $row[$i][0]->tell() . "\n"; - echo "Data: " . $row[$i][0]->read(12) . "\n"; + echo "Row $i Size: " . $row[$i][0]->size() . "\n"; + echo "Pos 1: " . $row[$i][0]->tell() . "\n"; + echo "Data: " . $row[$i][0]->read(5) . "\n"; + echo "Pos 2: " . $row[$i][0]->tell() . "\n"; + echo "Data: " . $row[$i][0]->read(12) . "\n"; } echo "Done\n"; diff --git a/ext/oci8/tests/lob_041.phpt b/ext/oci8/tests/lob_041.phpt index dd0bfd58be..e2bf5fbaa1 100644 --- a/ext/oci8/tests/lob_041.phpt +++ b/ext/oci8/tests/lob_041.phpt @@ -13,9 +13,9 @@ require __DIR__.'/connect.inc'; // Initialization $stmtarray = array( - "DROP table lob_041_tab", - "CREATE table lob_041_tab(c1 CLOB)", - "INSERT INTO lob_041_tab VALUES('test data')" + "DROP table lob_041_tab", + "CREATE table lob_041_tab(c1 CLOB)", + "INSERT INTO lob_041_tab VALUES('test data')" ); oci8_test_sql_execute($c, $stmtarray); @@ -57,7 +57,7 @@ var_dump($data); echo "Done\n"; $stmtarray = array( - "DROP table lob_041_tab" + "DROP table lob_041_tab" ); oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/lob_043.phpt b/ext/oci8/tests/lob_043.phpt index 25e6870832..c0f8973dfd 100644 --- a/ext/oci8/tests/lob_043.phpt +++ b/ext/oci8/tests/lob_043.phpt @@ -14,9 +14,9 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "drop table lob_043_tab", - "create table lob_043_tab(id number, c1 clob)", - "begin + "drop table lob_043_tab", + "create table lob_043_tab(id number, c1 clob)", + "begin for i in 1..50000 loop insert into lob_043_tab (id, c1) values (i, i || ' abcdefghijklmnopq'); end loop; @@ -70,7 +70,7 @@ $r = f2($c); // Clean up $stmtarray = array( - "drop table lob_043_tab" + "drop table lob_043_tab" ); oci8_test_sql_execute($c, $stmtarray); @@ -78,11 +78,8 @@ oci8_test_sql_execute($c, $stmtarray); oci_close($c); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 f1 ended Test 2 f2 ended -===DONE=== diff --git a/ext/oci8/tests/lob_044.phpt b/ext/oci8/tests/lob_044.phpt index a2007c9c4b..242eef195d 100644 --- a/ext/oci8/tests/lob_044.phpt +++ b/ext/oci8/tests/lob_044.phpt @@ -13,8 +13,8 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "drop table lob_044_tab", - "create table lob_044_tab (blob BLOB)", + "drop table lob_044_tab", + "create table lob_044_tab (blob BLOB)", ); oci8_test_sql_execute($c, $stmtarray); @@ -51,14 +51,12 @@ var_dump($row[0]->read(10000)); // Clean up $stmtarray = array( - "drop table lob_044_tab" + "drop table lob_044_tab" ); oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECT-- Test 1 - truncate on insert int(72) @@ -70,4 +68,3 @@ string(0) "" Test 2 - read it back string(0) "" -===DONE=== diff --git a/ext/oci8/tests/lob_temp2.phpt b/ext/oci8/tests/lob_temp2.phpt index e789014d36..1861f3021d 100644 --- a/ext/oci8/tests/lob_temp2.phpt +++ b/ext/oci8/tests/lob_temp2.phpt @@ -27,7 +27,6 @@ oci_fetch_all($s, $res); var_dump($res); ?> -===DONE=== --EXPECT-- bool(true) array(1) { @@ -37,4 +36,3 @@ array(1) { string(4) "test" } } -===DONE=== diff --git a/ext/oci8/tests/null_byte_1.phpt b/ext/oci8/tests/null_byte_1.phpt index 61b5ecc2fe..4a69258ea3 100644 --- a/ext/oci8/tests/null_byte_1.phpt +++ b/ext/oci8/tests/null_byte_1.phpt @@ -32,15 +32,12 @@ $r = $lob->export("/tmp/abc\0def"); var_dump($r); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1: Import -Warning: OCI-Lob::savefile() expects parameter 1 to be a valid path, string given in %snull_byte_1.php on line %d +Warning: OCI-Lob::savefile(): Argument #1 ($function) must be a valid path, string given in %snull_byte_1.php on line %d NULL Test 2: Export -Warning: OCI-Lob::export() expects parameter 1 to be a valid path, string given in %snull_byte_1.php on line %d +Warning: OCI-Lob::export(): Argument #1 ($function) must be a valid path, string given in %snull_byte_1.php on line %d NULL -===DONE=== diff --git a/ext/oci8/tests/null_byte_2.phpt b/ext/oci8/tests/null_byte_2.phpt index e95564e322..132fda5e1d 100644 --- a/ext/oci8/tests/null_byte_2.phpt +++ b/ext/oci8/tests/null_byte_2.phpt @@ -31,8 +31,6 @@ oci_execute($s); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1: Valid use of a null byte array(1) { @@ -47,4 +45,3 @@ Test 3: Using a null byte in a bind variable name Warning: oci_bind_by_name(): ORA-01036: %s in %snull_byte_2.php on line %d Warning: oci_execute(): ORA-01008: %s in %snull_byte_2.php on line %d -===DONE=== diff --git a/ext/oci8/tests/null_byte_3.phpt b/ext/oci8/tests/null_byte_3.phpt index f44d218aa0..d739cf179b 100644 --- a/ext/oci8/tests/null_byte_3.phpt +++ b/ext/oci8/tests/null_byte_3.phpt @@ -27,8 +27,6 @@ oci_fetch_all($s, $res); var_dump($res); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1: Invalid use of a null byte @@ -39,4 +37,3 @@ array(1) { array(0) { } } -===DONE=== diff --git a/ext/oci8/tests/password.phpt b/ext/oci8/tests/password.phpt index b3f3bfce0c..1e8d8c83aa 100644 --- a/ext/oci8/tests/password.phpt +++ b/ext/oci8/tests/password.phpt @@ -14,8 +14,8 @@ if ($test_drcp) die("skip password change not supported in DRCP Mode"); require(__DIR__."/connect.inc"); $stmtarray = array( - "drop user testuser_pw cascade", - "create user testuser_pw identified by testuserpwd", + "drop user testuser_pw cascade", + "create user testuser_pw identified by testuserpwd", "grant connect, create session to testuser_pw" ); @@ -41,21 +41,21 @@ $rn3 = (int)$c3; // Connections should differ if ($rn1 == $rn2) { - echo "First and second connections share a resource: Not OK\n"; - var_dump($c1); + echo "First and second connections share a resource: Not OK\n"; + var_dump($c1); } else { - echo "First and second connections are different: OK\n"; + echo "First and second connections are different: OK\n"; } // Connections should be the same if ($rn1 == $rn3) { - echo "First and third connections share a resource: OK\n"; + echo "First and third connections share a resource: OK\n"; } else { - echo "First and third connections are different: Not OK\n"; - var_dump($c1); - var_dump($c2); + echo "First and third connections are different: Not OK\n"; + var_dump($c1); + var_dump($c2); } echo "Done\n"; diff --git a/ext/oci8/tests/password_2.phpt b/ext/oci8/tests/password_2.phpt index b3e9e3058f..b47fad57f3 100644 --- a/ext/oci8/tests/password_2.phpt +++ b/ext/oci8/tests/password_2.phpt @@ -14,7 +14,7 @@ if ($test_drcp) die("skip password change not supported in DRCP Mode"); require(__DIR__."/connect.inc"); $stmtarray = array( - "drop user testuser_pw2 cascade", + "drop user testuser_pw2 cascade", "create user testuser_pw2 identified by testuserpwd", "grant connect, create session to testuser_pw2" ); @@ -40,21 +40,21 @@ $rn3 = (int)$c3; // Connections should differ if ($rn1 == $rn2) { - echo "First and second connections share a resource: Not OK\n"; - var_dump($c1); + echo "First and second connections share a resource: Not OK\n"; + var_dump($c1); } else { - echo "First and second connections are different: OK\n"; + echo "First and second connections are different: OK\n"; } // Connections should be the same if ($rn1 == $rn3) { - echo "First and third connections share a resource: OK\n"; + echo "First and third connections share a resource: OK\n"; } else { - echo "First and third connections are different: Not OK\n"; - var_dump($c1); - var_dump($c2); + echo "First and third connections are different: Not OK\n"; + var_dump($c1); + var_dump($c2); } echo "Done\n"; diff --git a/ext/oci8/tests/password_new.phpt b/ext/oci8/tests/password_new.phpt index 6e9d2f4780..c0e53001df 100644 --- a/ext/oci8/tests/password_new.phpt +++ b/ext/oci8/tests/password_new.phpt @@ -2,7 +2,7 @@ oci_password_change() --SKIPIF-- <?php -$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on thes +$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(__DIR__.'/skipif.inc'); require(__DIR__.'/connect.inc'); if (empty($dbase)) die ("skip requires database connection string be set"); diff --git a/ext/oci8/tests/password_old.phpt b/ext/oci8/tests/password_old.phpt index f791e25c3a..a92dba4366 100644 --- a/ext/oci8/tests/password_old.phpt +++ b/ext/oci8/tests/password_old.phpt @@ -2,7 +2,7 @@ ocipasswordchange() --SKIPIF-- <?php -$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on thes +$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(__DIR__.'/skipif.inc'); require(__DIR__.'/connect.inc'); if (empty($dbase)) die ("skip requires database connection string be set"); diff --git a/ext/oci8/tests/pecl_bug10194.phpt b/ext/oci8/tests/pecl_bug10194.phpt index c0265af34f..d4b0707abc 100644 --- a/ext/oci8/tests/pecl_bug10194.phpt +++ b/ext/oci8/tests/pecl_bug10194.phpt @@ -34,7 +34,7 @@ $row = oci_fetch_assoc($statement); $string = str_repeat("test", 32768*4*4); for ($i = 0; $i < 8; $i++) { - $row['CLOB']->write($string); + $row['CLOB']->write($string); } oci_commit($c); diff --git a/ext/oci8/tests/pecl_bug16035.phpt b/ext/oci8/tests/pecl_bug16035.phpt index d557e0a5c0..2fdef26831 100644 --- a/ext/oci8/tests/pecl_bug16035.phpt +++ b/ext/oci8/tests/pecl_bug16035.phpt @@ -19,11 +19,8 @@ ORACLE_HOME="" oci_connect('abc', 'def', 'ghi', 'jkl'); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Warning: oci_connect(): OCIEnvNlsCreate() failed. There is something wrong with your system - please check that ORACLE_HOME and %s are set and point to the right directories in %s on line %d Warning: oci_connect(): Error while trying to retrieve text for error ORA-01804 in %specl_bug16035.php on line %d -===DONE=== diff --git a/ext/oci8/tests/pecl_bug16842.phpt b/ext/oci8/tests/pecl_bug16842.phpt index c4a3fc2650..302b81d68c 100644 --- a/ext/oci8/tests/pecl_bug16842.phpt +++ b/ext/oci8/tests/pecl_bug16842.phpt @@ -33,8 +33,6 @@ var_dump(oci_error($s)); oci_close($c); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 Raises NO_DATA_FOUND @@ -70,4 +68,3 @@ ORA-06512: at line 1" ["sqltext"]=> string(29) "begin raise ZERO_DIVIDE; end;" } -===DONE=== diff --git a/ext/oci8/tests/pecl_bug6109.phpt b/ext/oci8/tests/pecl_bug6109.phpt index f5cee7065d..b529058ff8 100644 --- a/ext/oci8/tests/pecl_bug6109.phpt +++ b/ext/oci8/tests/pecl_bug6109.phpt @@ -15,12 +15,12 @@ $s = oci_parse($c, 'delete from table_does_not_exist'); $r = @oci_execute($s); if ($r) { - echo "whoops - table does exist\n"; + echo "whoops - table does exist\n"; } else { - for ($i = 0; $i < 5; $i++) { - $err = oci_error($s); - echo ($i) .' -> '.$err['message'] ."\n"; - } + for ($i = 0; $i < 5; $i++) { + $err = oci_error($s); + echo ($i) .' -> '.$err['message'] ."\n"; + } } // Cleanup diff --git a/ext/oci8/tests/pecl_bug8816.phpt b/ext/oci8/tests/pecl_bug8816.phpt index 30b76265dc..dda6b9f8b1 100644 --- a/ext/oci8/tests/pecl_bug8816.phpt +++ b/ext/oci8/tests/pecl_bug8816.phpt @@ -29,17 +29,17 @@ $values = array("1234567890111111111", "122222222222222", "985456745674567654567 $i = 0; foreach ($values as $val) { - $i++; - $insert = "INSERT INTO t1 VALUES($i, ".$val.")"; - $s = oci_parse($c, $insert); - oci_execute($s); + $i++; + $insert = "INSERT INTO t1 VALUES($i, ".$val.")"; + $s = oci_parse($c, $insert); + oci_execute($s); } foreach ($values as $val) { - $insert = "INSERT INTO t2 VALUES($i, ".$val.")"; - $s = oci_parse($c, $insert); - oci_execute($s); - $i--; + $insert = "INSERT INTO t2 VALUES($i, ".$val.")"; + $s = oci_parse($c, $insert); + oci_execute($s); + $i--; } $query =" @@ -56,7 +56,7 @@ $sth = oci_parse($c, $query); oci_execute($sth); while ( $row = oci_fetch_assoc($sth) ) { - var_dump($row); + var_dump($row); } $s1 = oci_parse($c, $drop_1); diff --git a/ext/oci8/tests/prefetch.phpt b/ext/oci8/tests/prefetch.phpt index fa71b5ac6a..2bf1153ada 100644 --- a/ext/oci8/tests/prefetch.phpt +++ b/ext/oci8/tests/prefetch.phpt @@ -24,13 +24,13 @@ oci8_test_sql_execute($c, $stmtarray); $select_sql = "select * from prefetch_tab"; if (!($s = oci_parse($c, $select_sql))) { - die("oci_parse(select) failed!\n"); + die("oci_parse(select) failed!\n"); } var_dump(oci_set_prefetch($s, 10)); if (!oci_execute($s)) { - die("oci_execute(select) failed!\n"); + die("oci_execute(select) failed!\n"); } var_dump(oci_fetch($s)); diff --git a/ext/oci8/tests/prefetch_old.phpt b/ext/oci8/tests/prefetch_old.phpt index 58bdae7565..1fdf01305e 100644 --- a/ext/oci8/tests/prefetch_old.phpt +++ b/ext/oci8/tests/prefetch_old.phpt @@ -20,19 +20,19 @@ oci8_test_sql_execute($c, $stmtarray); // Run Test if (!ocicommit($c)) { - die("ocicommit() failed!\n"); + die("ocicommit() failed!\n"); } $select_sql = "select * from prefetch_old_tab"; if (!($s = ociparse($c, $select_sql))) { - die("ociparse(select) failed!\n"); + die("ociparse(select) failed!\n"); } var_dump(ocisetprefetch($s, 10)); if (!ociexecute($s)) { - die("ociexecute(select) failed!\n"); + die("ociexecute(select) failed!\n"); } var_dump(ocifetch($s)); diff --git a/ext/oci8/tests/privileged_connect.phpt b/ext/oci8/tests/privileged_connect.phpt index 5d9fbb0a45..26955d4b17 100644 --- a/ext/oci8/tests/privileged_connect.phpt +++ b/ext/oci8/tests/privileged_connect.phpt @@ -21,5 +21,5 @@ Warning: oci_connect(): Privileged connect is disabled. Enable oci8.privileged_c Warning: oci_connect(): Invalid session mode specified (-1) in %s on line %d -Warning: oci_connect() expects parameter 5 to be int%s string given in %s on line %d +Warning: oci_connect(): Argument #5 must be of type int%s string given in %s on line %d Done diff --git a/ext/oci8/tests/privileged_connect1.phpt b/ext/oci8/tests/privileged_connect1.phpt index 181dba5f1d..8093620168 100644 --- a/ext/oci8/tests/privileged_connect1.phpt +++ b/ext/oci8/tests/privileged_connect1.phpt @@ -23,5 +23,5 @@ Warning: oci_connect(): ORA-%d: %s in %s on line %d Warning: oci_connect(): Invalid session mode specified (-1) in %s on line %d -Warning: oci_connect() expects parameter 5 to be int%s string given in %s on line %d +Warning: oci_connect(): Argument #5 must be of type int%s string given in %s on line %d Done diff --git a/ext/oci8/tests/refcur_prefetch_1.phpt b/ext/oci8/tests/refcur_prefetch_1.phpt index 1f00b9b031..911a481063 100644 --- a/ext/oci8/tests/refcur_prefetch_1.phpt +++ b/ext/oci8/tests/refcur_prefetch_1.phpt @@ -23,25 +23,25 @@ require(__DIR__."/connect.inc"); // Creates the necessary package and tables. $stmtarray = array( - "DROP TABLE refcurtest", - "CREATE TABLE refcurtest (c1 NUMBER, c2 VARCHAR(20))", + "DROP TABLE refcurtest", + "CREATE TABLE refcurtest (c1 NUMBER, c2 VARCHAR(20))", "CREATE or REPLACE PACKAGE refcurpkg is type refcursortype is ref cursor; procedure open_ref_cur(cur1 out refcursortype); procedure fetch_ref_cur(cur1 in refcursortype, c1 out number,c2 out varchar2); end refcurpkg;", "CREATE or REPLACE PACKAGE body refcurpkg is - procedure open_ref_cur(cur1 out refcursortype) is + procedure open_ref_cur(cur1 out refcursortype) is begin - open cur1 for select * from refcurtest order by c1; - end open_ref_cur; - procedure fetch_ref_cur(cur1 in refcursortype, c1 out number, - c2 out varchar2) is - begin - fetch cur1 into c1,c2; - end fetch_ref_cur; + open cur1 for select * from refcurtest order by c1; + end open_ref_cur; + procedure fetch_ref_cur(cur1 in refcursortype, c1 out number, + c2 out varchar2) is + begin + fetch cur1 into c1,c2; + end fetch_ref_cur; end refcurpkg;" - ); + ); oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/refcur_prefetch_2.phpt b/ext/oci8/tests/refcur_prefetch_2.phpt index 10f0764a7a..69146914a4 100644 --- a/ext/oci8/tests/refcur_prefetch_2.phpt +++ b/ext/oci8/tests/refcur_prefetch_2.phpt @@ -23,25 +23,25 @@ require __DIR__."/connect.inc"; // Creates the necessary package and tables. $stmtarray = array( - "DROP TABLE refcurtest", - "CREATE TABLE refcurtest (c1 NUMBER, c2 VARCHAR(20))", + "DROP TABLE refcurtest", + "CREATE TABLE refcurtest (c1 NUMBER, c2 VARCHAR(20))", "CREATE or REPLACE PACKAGE refcurpkg is type refcursortype is ref cursor; procedure open_ref_cur(cur1 out refcursortype); procedure fetch_ref_cur(cur1 in refcursortype, c1 out number,c2 out varchar2); end refcurpkg;", "CREATE or REPLACE PACKAGE body refcurpkg is - procedure open_ref_cur(cur1 out refcursortype) is + procedure open_ref_cur(cur1 out refcursortype) is begin - open cur1 for select * from refcurtest order by c1; - end open_ref_cur; - procedure fetch_ref_cur(cur1 in refcursortype, c1 out number, - c2 out varchar2) is - begin - fetch cur1 into c1,c2; - end fetch_ref_cur; + open cur1 for select * from refcurtest order by c1; + end open_ref_cur; + procedure fetch_ref_cur(cur1 in refcursortype, c1 out number, + c2 out varchar2) is + begin + fetch cur1 into c1,c2; + end fetch_ref_cur; end refcurpkg;" - ); + ); oci8_test_sql_execute($c, $stmtarray); @@ -130,7 +130,7 @@ var_dump($c2); function print_roundtrips($c) { $sql_stmt = "select value from v\$mystat a,v\$statname c where - a.statistic#=c.statistic# and c.name='SQL*Net roundtrips to/from client'"; + a.statistic#=c.statistic# and c.name='SQL*Net roundtrips to/from client'"; $s = oci_parse($c,$sql_stmt); oci_define_by_name($s,"VALUE",$value); oci_execute($s); diff --git a/ext/oci8/tests/refcur_prefetch_4.phpt b/ext/oci8/tests/refcur_prefetch_4.phpt index 8aee48cfee..6c0b1b26d0 100644 --- a/ext/oci8/tests/refcur_prefetch_4.phpt +++ b/ext/oci8/tests/refcur_prefetch_4.phpt @@ -23,9 +23,9 @@ require __DIR__."/connect.inc"; // Creates the necessary package and tables. $stmtarray = array( - "DROP TABLE refcurtest", + "DROP TABLE refcurtest", - "CREATE TABLE refcurtest (c1 NUMBER, c2 VARCHAR(20))", + "CREATE TABLE refcurtest (c1 NUMBER, c2 VARCHAR(20))", "CREATE or REPLACE PACKAGE refcurpkg is type refcursortype is ref cursor; @@ -34,16 +34,16 @@ $stmtarray = array( end refcurpkg;", "CREATE or REPLACE PACKAGE body refcurpkg is - procedure open_ref_cur(cur1 out refcursortype) is + procedure open_ref_cur(cur1 out refcursortype) is begin - open cur1 for select * from refcurtest order by c1; - end open_ref_cur; - procedure fetch_ref_cur(cur1 in refcursortype, c1 out number, c2 out varchar2) is - begin - fetch cur1 into c1,c2; - end fetch_ref_cur; + open cur1 for select * from refcurtest order by c1; + end open_ref_cur; + procedure fetch_ref_cur(cur1 in refcursortype, c1 out number, c2 out varchar2) is + begin + fetch cur1 into c1,c2; + end fetch_ref_cur; end refcurpkg;" - ); + ); oci8_test_sql_execute($c, $stmtarray); @@ -134,7 +134,7 @@ var_dump($c2); function print_roundtrips($c) { $sql_stmt = "select value from v\$mystat a,v\$statname c where - a.statistic#=c.statistic# and c.name='SQL*Net roundtrips to/from client'"; + a.statistic#=c.statistic# and c.name='SQL*Net roundtrips to/from client'"; $s = oci_parse($c,$sql_stmt); oci_define_by_name($s,"VALUE",$value); oci_execute($s); diff --git a/ext/oci8/tests/reflection1.phpt b/ext/oci8/tests/reflection1.phpt index 2cf3e4055b..43c3205337 100644 --- a/ext/oci8/tests/reflection1.phpt +++ b/ext/oci8/tests/reflection1.phpt @@ -129,8 +129,6 @@ reflection::export(new reflectionfunction('oci_set_client_identifier')); reflection::export(new reflectionfunction('oci_get_implicit_resultset')); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Function [ <internal%s> function oci_define_by_name ] { @@ -1101,4 +1099,3 @@ Function [ <internal%s> function oci_get_implicit_resultset ] { } } -===DONE=== diff --git a/ext/oci8/tests/reflection2.phpt b/ext/oci8/tests/reflection2.phpt index 9e63db1d63..38ee637b27 100644 --- a/ext/oci8/tests/reflection2.phpt +++ b/ext/oci8/tests/reflection2.phpt @@ -9,8 +9,6 @@ reflection::export(new reflectionclass('OCI-Lob')); reflection::export(new reflectionclass('OCI-Collection')); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Class [ <internal:oci8> class OCI-Lob ] { @@ -255,4 +253,3 @@ Class [ <internal%s> class OCI-Collection ] { } } -===DONE=== diff --git a/ext/oci8/tests/serverversion.phpt b/ext/oci8/tests/serverversion.phpt index 2667cc5539..d2a781e6a3 100644 --- a/ext/oci8/tests/serverversion.phpt +++ b/ext/oci8/tests/serverversion.phpt @@ -8,10 +8,10 @@ oci_server_version() require __DIR__."/connect.inc"; if (!empty($dbase)) { - var_dump($c = oci_connect($user, $password, $dbase)); + var_dump($c = oci_connect($user, $password, $dbase)); } else { - var_dump($c = oci_connect($user, $password)); + var_dump($c = oci_connect($user, $password)); } $v = oci_server_version($c); diff --git a/ext/oci8/tests/statement_type.phpt b/ext/oci8/tests/statement_type.phpt index e294cac60e..d8e6772750 100644 --- a/ext/oci8/tests/statement_type.phpt +++ b/ext/oci8/tests/statement_type.phpt @@ -12,8 +12,8 @@ $sqls = Array( "DELETE FROM table WHERE id = 1", "INSERT INTO table VALUES(1)", "UPDATE table SET id = 1", - "DROP TABLE table", - "CREATE OR REPLACE PROCEDURE myproc(v1 NUMBER) as BEGIN DBMS_OUTPUT.PUT_LINE(v1); END;", + "DROP TABLE table", + "CREATE OR REPLACE PROCEDURE myproc(v1 NUMBER) as BEGIN DBMS_OUTPUT.PUT_LINE(v1); END;", "CREATE TABLE table (id NUMBER)", "ALTER TABLE table ADD (col1 NUMBER)", "BEGIN NULL; END;", @@ -24,8 +24,8 @@ $sqls = Array( ); foreach ($sqls as $sql) { - $s = oci_parse($c, $sql); - var_dump(oci_statement_type($s)); + $s = oci_parse($c, $sql); + var_dump(oci_statement_type($s)); } echo "Done\n"; diff --git a/ext/oci8/tests/statement_type_old.phpt b/ext/oci8/tests/statement_type_old.phpt index aa0565e27b..b095bc245f 100644 --- a/ext/oci8/tests/statement_type_old.phpt +++ b/ext/oci8/tests/statement_type_old.phpt @@ -8,10 +8,10 @@ ocistatementtype() require __DIR__."/connect.inc"; if (!empty($dbase)) { - var_dump($c = ocilogon($user, $password, $dbase)); + var_dump($c = ocilogon($user, $password, $dbase)); } else { - var_dump($c = ocilogon($user, $password)); + var_dump($c = ocilogon($user, $password)); } $sqls = Array( @@ -19,8 +19,8 @@ $sqls = Array( "DELETE FROM table WHERE id = 1", "INSERT INTO table VALUES(1)", "UPDATE table SET id = 1", - "DROP TABLE table", - "CREATE OR REPLACE PROCEDURE myproc(v1 NUMBER) as BEGIN DBMS_OUTPUT.PUT_LINE(v1); END;", + "DROP TABLE table", + "CREATE OR REPLACE PROCEDURE myproc(v1 NUMBER) as BEGIN DBMS_OUTPUT.PUT_LINE(v1); END;", "CREATE TABLE table (id NUMBER)", "ALTER TABLE table ADD (col1 NUMBER)", "BEGIN NULL; END;", @@ -31,8 +31,8 @@ $sqls = Array( ); foreach ($sqls as $sql) { - $s = ociparse($c, $sql); - var_dump(ocistatementtype($s)); + $s = ociparse($c, $sql); + var_dump(ocistatementtype($s)); } echo "Done\n"; diff --git a/ext/oci8/tests/testping.phpt b/ext/oci8/tests/testping.phpt index 2c64c440d7..589b5c21b0 100644 --- a/ext/oci8/tests/testping.phpt +++ b/ext/oci8/tests/testping.phpt @@ -10,12 +10,12 @@ oci8.ping_interval=0 require(__DIR__.'/details.inc'); for ($i = 0; $i < 2; $i++) { - if (!empty($dbase)) { - $c = oci_pconnect($user,$password,$dbase); - } - else { - $c = oci_pconnect($user,$password); - } + if (!empty($dbase)) { + $c = oci_pconnect($user,$password,$dbase); + } + else { + $c = oci_pconnect($user,$password); + } } echo "Done\n"; diff --git a/ext/oci8/tests/xmltype_01.phpt b/ext/oci8/tests/xmltype_01.phpt index debbe14f83..a99a39223e 100644 --- a/ext/oci8/tests/xmltype_01.phpt +++ b/ext/oci8/tests/xmltype_01.phpt @@ -14,37 +14,37 @@ require(__DIR__."/connect.inc"); // Initialization $stmtarray = array( - "drop table xtt", - "create table xtt - (xt_id number, xt_spec xmltype) - xmltype xt_spec store as clob", - "insert into xtt (xt_id, xt_spec) values - (1, - xmltype('<?xml version=\"1.0\"?> - <Xt> - <XtId>1</XtId> - <Size>Big</Size> - <Area>12345</Area> - <Hardness>20</Hardness> - <Lip>Curved</Lip> - <Color>Red</Color> - <Nice>N</Nice> - <Compact>Tiny</Compact> - <Material>Steel</Material> - </Xt>'))" + "drop table xtt", + "create table xtt + (xt_id number, xt_spec xmltype) + xmltype xt_spec store as clob", + "insert into xtt (xt_id, xt_spec) values + (1, + xmltype('<?xml version=\"1.0\"?> + <Xt> + <XtId>1</XtId> + <Size>Big</Size> + <Area>12345</Area> + <Hardness>20</Hardness> + <Lip>Curved</Lip> + <Color>Red</Color> + <Nice>N</Nice> + <Compact>Tiny</Compact> + <Material>Steel</Material> + </Xt>'))" ); oci8_test_sql_execute($c, str_replace("\r", "", $stmtarray)); function do_query($c) { - $s = oci_parse($c, 'select XMLType.getClobVal(xt_spec) - from xtt where xt_id = 1'); - oci_execute($s); - $row = oci_fetch_row($s); - $data = $row[0]->load(); - var_dump($data); - return($data); + $s = oci_parse($c, 'select XMLType.getClobVal(xt_spec) + from xtt where xt_id = 1'); + oci_execute($s); + $row = oci_fetch_row($s); + $data = $row[0]->load(); + var_dump($data); + return($data); } // Check @@ -58,8 +58,8 @@ $sx->Nice = 'Y'; // Insert changes using a temporary CLOB $s = oci_parse($c, 'update xtt - set xt_spec = XMLType(:clob) - where xt_id = 1'); + set xt_spec = XMLType(:clob) + where xt_id = 1'); $lob = oci_new_descriptor($c, OCI_D_LOB); oci_bind_by_name($s, ':clob', $lob, -1, OCI_B_CLOB); $lob->writeTemporary($sx->asXml()); @@ -73,7 +73,7 @@ $data = do_query($c); // Cleanup $stmtarray = array( - "drop table xtt", + "drop table xtt", ); oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/xmltype_02.phpt b/ext/oci8/tests/xmltype_02.phpt index 35f8750255..6b701b0c93 100644 --- a/ext/oci8/tests/xmltype_02.phpt +++ b/ext/oci8/tests/xmltype_02.phpt @@ -14,8 +14,8 @@ require(__DIR__.'/connect.inc'); // Initialization $stmtarray = array( - "drop table xmltype_02_tab", - "create table xmltype_02_tab (warehouse_id number, warehouse_spec xmltype)", + "drop table xmltype_02_tab", + "create table xmltype_02_tab (warehouse_id number, warehouse_spec xmltype)", ); oci8_test_sql_execute($c, $stmtarray); @@ -101,14 +101,12 @@ $row[0]->free(); // Clean up $stmtarray = array( - "drop table xmltype_02_tab" + "drop table xmltype_02_tab" ); oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== -<?php exit(0); ?> --EXPECTF-- Test 1 Insert new XML data using a temporary CLOB array(1) { @@ -178,4 +176,3 @@ string(%d) "<?xml version="1.0"?> %sVClearance>10</VClearance> </Warehouse> " -===DONE=== |