diff options
| author | Christopher Jones <christopher.jones@oracle.com> | 2018-12-10 10:16:27 +1100 |
|---|---|---|
| committer | Christopher Jones <christopher.jones@oracle.com> | 2018-12-10 10:16:27 +1100 |
| commit | e47025ffc5cee988becf25199f708891f62e792d (patch) | |
| tree | 8a4df476c96688a0c0a34897433666152282f6aa | |
| parent | 6734b1106f08f949aee3435fe4d1527393c1d23d (diff) | |
| parent | e4d894edb3a55180bca3bee41d99c3aa6df74cfd (diff) | |
| download | php-git-e47025ffc5cee988becf25199f708891f62e792d.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -rwxr-xr-x | ext/oci8/tests/calltimeout1.phpt | 6 | ||||
| -rw-r--r-- | ext/oci8/tests/db_op_2.phpt | 4 | ||||
| -rw-r--r-- | ext/oci8/tests/lob_015.phpt | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/ext/oci8/tests/calltimeout1.phpt b/ext/oci8/tests/calltimeout1.phpt index acc25c224a..4411ed0f2c 100755 --- a/ext/oci8/tests/calltimeout1.phpt +++ b/ext/oci8/tests/calltimeout1.phpt @@ -42,16 +42,10 @@ echo "Test 1\n"; oci_set_call_timeout($c, 4000); // milliseconds $r = mysleep($c, 8); // seconds -echo "Test 2\n"; -oci_set_call_timeout($c, 0); -$r = mysleep($c, 5); - ?> ===DONE=== <?php exit(0); ?> --EXPECTF-- Test 1 Execute error was ORA-03136: %s -Test 2 -Execute error was ORA-03114: %s ===DONE=== diff --git a/ext/oci8/tests/db_op_2.phpt b/ext/oci8/tests/db_op_2.phpt index 30709c9e36..8710149911 100644 --- a/ext/oci8/tests/db_op_2.phpt +++ b/ext/oci8/tests/db_op_2.phpt @@ -46,7 +46,7 @@ echo "Test 2\n"; oci_set_db_operation($c, ""); dq($c, 'select /*+ MONITOR */ \'dboptest\' from dual'); -dq($c, 'select sql_text, dbop_name from v$sql_monitor where sql_text like \'%dboptest2%\' order by dbop_exec_id desc'); +dq($c, 'select sql_text, dbop_name from v$sql_monitor where sql_text like \'%dboptest%\' order by dbop_exec_id desc'); ?> ===DONE=== @@ -72,7 +72,7 @@ array(1) { } array(2) { ["SQL_TEXT"]=> - string(121) "select /*+ MONITOR */ sql_text, dbop_name from v$sql_monitor where sql_text like '%dboptest2%' order by dbop_exec_id desc" + string(42) "select /*+ MONITOR */ 'dboptest' from dual" ["DBOP_NAME"]=> NULL } diff --git a/ext/oci8/tests/lob_015.phpt b/ext/oci8/tests/lob_015.phpt index 841961a29e..592eaab9fb 100644 --- a/ext/oci8/tests/lob_015.phpt +++ b/ext/oci8/tests/lob_015.phpt @@ -47,8 +47,6 @@ Warning: oci_bind_by_name() expects at most 5 parameters, 7 given in %s on line Warning: oci_bind_by_name() expects at least 3 parameters, 2 given in %s on line %d Warning: oci_bind_by_name() expects at least 3 parameters, 1 given in %s on line %d - -Warning: oci_execute(): ORA-00932: %s on line %d object(OCI-Lob)#%d (1) { ["descriptor"]=> resource(%d) of type (oci8 descriptor) |