clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.2' into PHP-7.3

Browse Source
This commit is contained in:
Christopher Jones 2018-12-10 10:16:27 +11:00
commit e47025ffc5
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/oci8/tests/calltimeout1.phpt
View File

@ -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===

4
ext/oci8/tests/db_op_2.phpt
View File

@ -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
}

2
ext/oci8/tests/lob_015.phpt
View File

@ -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)