Initial PHP OCI8 2.0.0-dev commit.

Includes Oracle Database 12c Implicit Result Set support, DTrace
support, and various code cleanups.

See package.xml for details.

1 files changed, 99 insertions, 0 deletions

diff --git a/ext/oci8/tests/imp_res_cursor.phpt b/ext/oci8/tests/imp_res_cursor.phpt
new file mode 100644
index 0000000000..cac0a5d1c0
--- /dev/null
+++ b/ext/oci8/tests/imp_res_cursor.phpt
@@ -0,0 +1,99 @@
+--TEST--
+Oracle Database 12c Implicit Result Sets: nested cursor
+--SKIPIF--
+<?php 
+if (!extension_loaded('oci8')) die ("skip no oci8 extension"); 
+$target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
+require(dirname(__FILE__).'/skipif.inc');
+preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches);
+if (!(isset($matches[0]) && $matches[1] >= 12)) {
+    die("skip expected output only valid when using Oracle Database 12c or greater");
+}
+preg_match('/^[[:digit:]]+/', oci_client_version(), $matches);
+if (!(isset($matches[0]) && $matches[0] >= 12)) { 
+    die("skip works only with Oracle 12c or greater version of Oracle client libraries");
+}
+?>
+--FILE--
+<?php
+
+require(dirname(__FILE__).'/connect.inc');
+
+// Initialization
+
+$stmtarray = array(
+    "drop table imp_res_cursor_tab_1",
+    "create table imp_res_cursor_tab_1 (c1 number, c2 varchar2(10))",
+    "insert into imp_res_cursor_tab_1 values (1, 'abcde')",
+    "insert into imp_res_cursor_tab_1 values (2, 'fghij')",
+    "insert into imp_res_cursor_tab_1 values (3, 'klmno')",
+
+    "drop table imp_res_cursor_tab_2",
+    "create table imp_res_cursor_tab_2 (c3 varchar2(1))",
+    "insert into imp_res_cursor_tab_2 values ('t')",
+    "insert into imp_res_cursor_tab_2 values ('u')",
+    "insert into imp_res_cursor_tab_2 values ('v')",
+
+    "create or replace procedure imp_res_cursor_proc as
+      c1 sys_refcursor;
+    begin
+      open c1 for select * from dual;
+      dbms_sql.return_result (c1);
+
+      open c1 for select cursor(select c1, c2 from imp_res_cursor_tab_1 order by 1) as curs from dual;
+      dbms_sql.return_result(c1);
+
+      open c1 for select * from imp_res_cursor_tab_2 where rownum < 3 order by 1;
+      dbms_sql.return_result(c1);
+    end;"
+);
+
+oci8_test_sql_execute($c, $stmtarray);
+
+function do_fetch($s)
+{
+    while (($row = oci_fetch_assoc($s)) != false) {
+        foreach ($row as $item) {
+            if (is_resource($item)) {  // Nested cursor
+                oci_execute($item);
+                do_fetch($item);
+            } else {
+                echo "  ".$item;
+            }
+        }
+        echo "\n";
+    }
+}
+
+// Run Test
+
+echo "Test 1\n";
+
+$s = oci_parse($c, "begin imp_res_cursor_proc(); end;");
+oci_execute($s);
+
+do_fetch($s);
+
+// Clean up
+
+$stmtarray = array(
+    "drop procedure imp_res_cursor_proc",
+    "drop table imp_res_cursor_tab_1",
+    "drop table imp_res_cursor_tab_2"
+);
+
+oci8_test_sql_execute($c, $stmtarray);
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Test 1
+  X
+  1  abcde
+  2  fghij
+  3  klmno
+
+  t
+  u
+===DONE===