add new tests

19 files changed, 1250 insertions, 0 deletions

diff --git a/ext/oci8/tests/array_bind_001.phpt b/ext/oci8/tests/array_bind_001.phpt
new file mode 100644
index 0000000000..1310325ad4
--- /dev/null
+++ b/ext/oci8/tests/array_bind_001.phpt
@@ -0,0 +1,69 @@
+--TEST--
+oci_bind_array_by_name() and invalid values 1 
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__).'/connect.inc';
+
+$drop = "DROP table bind_test";
+$statement = oci_parse($c, $drop);
+@oci_execute($statement);
+
+$create = "CREATE table bind_test(name DATE)";
+$statement = oci_parse($c, $create);
+oci_execute($statement);
+
+$create_pkg = "
+CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+  TYPE ARRTYPE IS TABLE OF DATE INDEX BY BINARY_INTEGER; 
+  PROCEDURE iobind(c1 IN OUT ARRTYPE); 
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg);
+oci_execute($statement);
+
+$create_pkg_body = "
+CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+  CURSOR CUR IS SELECT name FROM bind_test;
+  PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
+    BEGIN
+    FOR i IN 1..5 LOOP
+      INSERT INTO bind_test VALUES (c1(i));
+    END LOOP;
+    IF NOT CUR%ISOPEN THEN
+      OPEN CUR;
+    END IF;
+    FOR i IN REVERSE 1..5 LOOP
+      FETCH CUR INTO c1(i);
+      IF CUR%NOTFOUND THEN
+        CLOSE CUR;
+        EXIT;
+      END IF;
+    END LOOP;
+  END iobind;
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg_body);
+oci_execute($statement);
+
+$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+
+$array = "";
+
+oci_bind_array_by_name($statement, ":c1", $array, 5, 5, SQLT_ODT);
+
+oci_execute($statement);
+
+var_dump($array);
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: oci_bind_array_by_name(): OCI-21560: argument 3 is null, invalid, or out of range in %s on line %d
+
+Warning: oci_execute(): ORA-01008: not all variables bound in %s on line %d
+array(1) {
+  [0]=>
+  string(0) ""
+}
+Done
diff --git a/ext/oci8/tests/array_bind_002.phpt b/ext/oci8/tests/array_bind_002.phpt
new file mode 100644
index 0000000000..4c76df42f9
--- /dev/null
+++ b/ext/oci8/tests/array_bind_002.phpt
@@ -0,0 +1,77 @@
+--TEST--
+oci_bind_array_by_name() and invalid values 2
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__).'/connect.inc';
+
+$drop = "DROP table bind_test";
+$statement = oci_parse($c, $drop);
+@oci_execute($statement);
+
+$create = "CREATE table bind_test(name DATE)";
+$statement = oci_parse($c, $create);
+oci_execute($statement);
+
+$create_pkg = "
+CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+  TYPE ARRTYPE IS TABLE OF DATE INDEX BY BINARY_INTEGER; 
+  PROCEDURE iobind(c1 IN OUT ARRTYPE); 
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg);
+oci_execute($statement);
+
+$create_pkg_body = "
+CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+  CURSOR CUR IS SELECT name FROM bind_test;
+  PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
+    BEGIN
+    FOR i IN 1..5 LOOP
+      INSERT INTO bind_test VALUES (c1(i));
+    END LOOP;
+    IF NOT CUR%ISOPEN THEN
+      OPEN CUR;
+    END IF;
+    FOR i IN REVERSE 1..5 LOOP
+      FETCH CUR INTO c1(i);
+      IF CUR%NOTFOUND THEN
+        CLOSE CUR;
+        EXIT;
+      END IF;
+    END LOOP;
+  END iobind;
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg_body);
+oci_execute($statement);
+
+$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+
+$array = Array("06-DEC-05","10-DEC-80","21-AUG-91","26-OCT-17","05-NOV-05");
+
+oci_bind_array_by_name($statement, ":c1", $array, 0, 0, SQLT_ODT);
+
+oci_execute($statement);
+
+var_dump($array);
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: oci_bind_array_by_name(): Maximum array length must be greater than zero in %s on line %d
+
+Warning: oci_execute(): ORA-01008: not all variables bound in %s on line %d
+array(5) {
+  [0]=>
+  string(9) "06-DEC-05"
+  [1]=>
+  string(9) "10-DEC-80"
+  [2]=>
+  string(9) "21-AUG-91"
+  [3]=>
+  string(9) "26-OCT-17"
+  [4]=>
+  string(9) "05-NOV-05"
+}
+Done
diff --git a/ext/oci8/tests/array_bind_003.phpt b/ext/oci8/tests/array_bind_003.phpt
new file mode 100644
index 0000000000..497e46e496
--- /dev/null
+++ b/ext/oci8/tests/array_bind_003.phpt
@@ -0,0 +1,73 @@
+--TEST--
+oci_bind_array_by_name() and invalid values 3
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__).'/connect.inc';
+
+$drop = "DROP table bind_test";
+$statement = oci_parse($c, $drop);
+@oci_execute($statement);
+
+$create = "CREATE table bind_test(name DATE)";
+$statement = oci_parse($c, $create);
+oci_execute($statement);
+
+$create_pkg = "
+CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+  TYPE ARRTYPE IS TABLE OF DATE INDEX BY BINARY_INTEGER; 
+  PROCEDURE iobind(c1 IN OUT ARRTYPE); 
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg);
+oci_execute($statement);
+
+$create_pkg_body = "
+CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+  CURSOR CUR IS SELECT name FROM bind_test;
+  PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
+    BEGIN
+    FOR i IN 1..5 LOOP
+      INSERT INTO bind_test VALUES (c1(i));
+    END LOOP;
+    IF NOT CUR%ISOPEN THEN
+      OPEN CUR;
+    END IF;
+    FOR i IN REVERSE 1..5 LOOP
+      FETCH CUR INTO c1(i);
+      IF CUR%NOTFOUND THEN
+        CLOSE CUR;
+        EXIT;
+      END IF;
+    END LOOP;
+  END iobind;
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg_body);
+oci_execute($statement);
+
+$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+
+$array = Array("06-DEC-05","10-DEC-80","21-AUG-91","26-OCT-17");
+
+oci_bind_array_by_name($statement, ":c1", $array, 5, 5, SQLT_ODT);
+
+oci_execute($statement);
+
+var_dump($array);
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: oci_execute(): OCI_NO_DATA in %s on line %d
+array(4) {
+  [0]=>
+  string(9) "06-DEC-05"
+  [1]=>
+  string(9) "10-DEC-80"
+  [2]=>
+  string(9) "21-AUG-91"
+  [3]=>
+  string(9) "26-OCT-17"
+}
+Done
diff --git a/ext/oci8/tests/array_bind_004.phpt b/ext/oci8/tests/array_bind_004.phpt
new file mode 100644
index 0000000000..1ddf85149b
--- /dev/null
+++ b/ext/oci8/tests/array_bind_004.phpt
@@ -0,0 +1,65 @@
+--TEST--
+oci_bind_array_by_name() and invalid values 4
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__).'/connect.inc';
+
+$drop = "DROP table bind_test";
+$statement = oci_parse($c, $drop);
+@oci_execute($statement);
+
+$create = "CREATE table bind_test(name DATE)";
+$statement = oci_parse($c, $create);
+oci_execute($statement);
+
+$create_pkg = "
+CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+  TYPE ARRTYPE IS TABLE OF DATE INDEX BY BINARY_INTEGER; 
+  PROCEDURE iobind(c1 IN OUT ARRTYPE); 
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg);
+oci_execute($statement);
+
+$create_pkg_body = "
+CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+  CURSOR CUR IS SELECT name FROM bind_test;
+  PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
+    BEGIN
+    FOR i IN 1..5 LOOP
+      INSERT INTO bind_test VALUES (c1(i));
+    END LOOP;
+    IF NOT CUR%ISOPEN THEN
+      OPEN CUR;
+    END IF;
+    FOR i IN REVERSE 1..5 LOOP
+      FETCH CUR INTO c1(i);
+      IF CUR%NOTFOUND THEN
+        CLOSE CUR;
+        EXIT;
+      END IF;
+    END LOOP;
+  END iobind;
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg_body);
+oci_execute($statement);
+
+$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+
+$array = Array();
+
+oci_bind_array_by_name($statement, ":c1", $array, 5, 5, SQLT_ODT);
+
+oci_execute($statement);
+
+var_dump($array);
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: oci_execute(): OCI_NO_DATA in %s on line %d
+array(0) {
+}
+Done
diff --git a/ext/oci8/tests/array_bind_005.phpt b/ext/oci8/tests/array_bind_005.phpt
new file mode 100644
index 0000000000..192d15563d
--- /dev/null
+++ b/ext/oci8/tests/array_bind_005.phpt
@@ -0,0 +1,74 @@
+--TEST--
+oci_bind_array_by_name() and invalid values 5
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__).'/connect.inc';
+
+$drop = "DROP table bind_test";
+$statement = oci_parse($c, $drop);
+@oci_execute($statement);
+
+$create = "CREATE table bind_test(name VARCHAR(20))";
+$statement = oci_parse($c, $create);
+oci_execute($statement);
+
+$create_pkg = "
+CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+  TYPE ARRTYPE IS TABLE OF VARCHAR(20) INDEX BY BINARY_INTEGER; 
+  PROCEDURE iobind(c1 IN OUT ARRTYPE); 
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg);
+oci_execute($statement);
+
+$create_pkg_body = "
+CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+  CURSOR CUR IS SELECT name FROM bind_test;
+  PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
+    BEGIN
+    FOR i IN 1..5 LOOP
+      INSERT INTO bind_test VALUES (c1(i));
+    END LOOP;
+    IF NOT CUR%ISOPEN THEN
+      OPEN CUR;
+    END IF;
+    FOR i IN REVERSE 1..5 LOOP
+      FETCH CUR INTO c1(i);
+      IF CUR%NOTFOUND THEN
+        CLOSE CUR;
+        EXIT;
+      END IF;
+    END LOOP;
+  END iobind;
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg_body);
+oci_execute($statement);
+
+$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+
+$array = Array("", "", "", "", "");
+
+oci_bind_array_by_name($statement, ":c1", $array, 5, 20, SQLT_CHR);
+
+oci_execute($statement);
+
+var_dump($array);
+
+echo "Done\n";
+?>
+--EXPECT--	
+array(5) {
+  [0]=>
+  string(0) ""
+  [1]=>
+  string(0) ""
+  [2]=>
+  string(0) ""
+  [3]=>
+  string(0) ""
+  [4]=>
+  string(0) ""
+}
+Done
diff --git a/ext/oci8/tests/array_bind_006.phpt b/ext/oci8/tests/array_bind_006.phpt
new file mode 100644
index 0000000000..e229dd8722
--- /dev/null
+++ b/ext/oci8/tests/array_bind_006.phpt
@@ -0,0 +1,74 @@
+--TEST--
+oci_bind_array_by_name(), SQLT_CHR and default max_length
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__).'/connect.inc';
+
+$drop = "DROP table bind_test";
+$statement = oci_parse($c, $drop);
+@oci_execute($statement);
+
+$create = "CREATE table bind_test(name VARCHAR(20))";
+$statement = oci_parse($c, $create);
+oci_execute($statement);
+
+$create_pkg = "
+CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+  TYPE ARRTYPE IS TABLE OF VARCHAR(20) INDEX BY BINARY_INTEGER; 
+  PROCEDURE iobind(c1 IN OUT ARRTYPE); 
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg);
+oci_execute($statement);
+
+$create_pkg_body = "
+CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+  CURSOR CUR IS SELECT name FROM bind_test;
+  PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
+    BEGIN
+    FOR i IN 1..5 LOOP
+      INSERT INTO bind_test VALUES (c1(i));
+    END LOOP;
+    IF NOT CUR%ISOPEN THEN
+      OPEN CUR;
+    END IF;
+    FOR i IN REVERSE 1..5 LOOP
+      FETCH CUR INTO c1(i);
+      IF CUR%NOTFOUND THEN
+        CLOSE CUR;
+        EXIT;
+      END IF;
+    END LOOP;
+  END iobind;
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg_body);
+oci_execute($statement);
+
+$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+
+$array = array("one", "two", "three", "four", "five");
+
+oci_bind_array_by_name($statement, ":c1", $array, 5, -1, SQLT_CHR);
+
+oci_execute($statement);
+
+var_dump($array);
+
+echo "Done\n";
+?>
+--EXPECT--	
+array(5) {
+  [0]=>
+  string(4) "five"
+  [1]=>
+  string(4) "four"
+  [2]=>
+  string(5) "three"
+  [3]=>
+  string(3) "two"
+  [4]=>
+  string(3) "one"
+}
+Done
diff --git a/ext/oci8/tests/array_bind_007.phpt b/ext/oci8/tests/array_bind_007.phpt
new file mode 100644
index 0000000000..10c92a8e7d
--- /dev/null
+++ b/ext/oci8/tests/array_bind_007.phpt
@@ -0,0 +1,77 @@
+--TEST--
+oci_bind_array_by_name() and invalid values 7
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__).'/connect.inc';
+
+$drop = "DROP table bind_test";
+$statement = oci_parse($c, $drop);
+@oci_execute($statement);
+
+$create = "CREATE table bind_test(name NUMBER)";
+$statement = oci_parse($c, $create);
+oci_execute($statement);
+
+$create_pkg = "
+CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+  TYPE ARRTYPE IS TABLE OF NUMBER INDEX BY BINARY_INTEGER; 
+  PROCEDURE iobind(c1 IN OUT ARRTYPE); 
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg);
+oci_execute($statement);
+
+$create_pkg_body = "
+CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+  CURSOR CUR IS SELECT name FROM bind_test;
+  PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
+    BEGIN
+    FOR i IN 1..5 LOOP
+      INSERT INTO bind_test VALUES (c1(i));
+    END LOOP;
+    IF NOT CUR%ISOPEN THEN
+      OPEN CUR;
+    END IF;
+    FOR i IN REVERSE 1..5 LOOP
+      FETCH CUR INTO c1(i);
+      IF CUR%NOTFOUND THEN
+        CLOSE CUR;
+        EXIT;
+      END IF;
+    END LOOP;
+  END iobind;
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg_body);
+oci_execute($statement);
+
+$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+
+$array = Array(1,2,3,4,5);
+
+oci_bind_array_by_name($statement, ":c1", $array, 5, 5, -1);
+
+oci_execute($statement);
+
+var_dump($array);
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: oci_bind_array_by_name(): Unknown or unsupported datatype given: -1 in %s on line %d
+
+Warning: oci_execute(): ORA-01008: not all variables bound in %s on line %d
+array(5) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+  [3]=>
+  int(4)
+  [4]=>
+  int(5)
+}
+Done
diff --git a/ext/oci8/tests/array_bind_008.phpt b/ext/oci8/tests/array_bind_008.phpt
new file mode 100644
index 0000000000..c44304c11c
--- /dev/null
+++ b/ext/oci8/tests/array_bind_008.phpt
@@ -0,0 +1,78 @@
+--TEST--
+oci_bind_array_by_name() and invalid values 8
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__).'/connect.inc';
+
+$drop = "DROP table bind_test";
+$statement = oci_parse($c, $drop);
+@oci_execute($statement);
+
+$create = "CREATE table bind_test(name NUMBER)";
+$statement = oci_parse($c, $create);
+oci_execute($statement);
+
+$create_pkg = "
+CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+  TYPE ARRTYPE IS TABLE OF NUMBER INDEX BY BINARY_INTEGER; 
+  PROCEDURE iobind(c1 IN OUT ARRTYPE); 
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg);
+oci_execute($statement);
+
+$create_pkg_body = "
+CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+  CURSOR CUR IS SELECT name FROM bind_test;
+  PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
+    BEGIN
+    FOR i IN 1..5 LOOP
+      INSERT INTO bind_test VALUES (c1(i));
+    END LOOP;
+    IF NOT CUR%ISOPEN THEN
+      OPEN CUR;
+    END IF;
+    FOR i IN REVERSE 1..5 LOOP
+      FETCH CUR INTO c1(i);
+      IF CUR%NOTFOUND THEN
+        CLOSE CUR;
+        EXIT;
+      END IF;
+    END LOOP;
+  END iobind;
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg_body);
+oci_execute($statement);
+
+$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+
+$array = Array(1,2,3,4,5);
+
+oci_bind_array_by_name($statement, ":c1", $array, 5, 5, SQLT_CHR);
+
+oci_execute($statement);
+
+var_dump($array);
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: oci_execute(): ORA-06550: line %d, column %d:
+PLS-00418: array bind type must match PL/SQL table row type
+ORA-06550: line %d, column %d:
+PL/SQL: Statement ignored in %s on line %d
+array(5) {
+  [0]=>
+  string(1) "1"
+  [1]=>
+  string(1) "2"
+  [2]=>
+  string(1) "3"
+  [3]=>
+  string(1) "4"
+  [4]=>
+  string(1) "5"
+}
+Done
diff --git a/ext/oci8/tests/array_bind_009.phpt b/ext/oci8/tests/array_bind_009.phpt
new file mode 100644
index 0000000000..8e83b0982c
--- /dev/null
+++ b/ext/oci8/tests/array_bind_009.phpt
@@ -0,0 +1,17 @@
+--TEST--
+oci_bind_array_by_name() and invalid values 9
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__).'/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
diff --git a/ext/oci8/tests/array_bind_010.phpt b/ext/oci8/tests/array_bind_010.phpt
new file mode 100644
index 0000000000..a77ed913ea
--- /dev/null
+++ b/ext/oci8/tests/array_bind_010.phpt
@@ -0,0 +1,36 @@
+--TEST--
+oci_bind_array_by_name() and invalid values 8
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__).'/connect.inc';
+
+$statement = oci_parse($c, 'SELECT user FROM v$session');
+
+$array = Array(1,2,3,4,5);
+
+oci_bind_array_by_name($statement, ":c1", $array, 5, 5, SQLT_CHR);
+
+oci_execute($statement);
+
+var_dump($array);
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: oci_bind_array_by_name(): ORA-01036: illegal variable name/number in %s on line %d
+array(5) {
+  [0]=>
+  string(1) "1"
+  [1]=>
+  string(1) "2"
+  [2]=>
+  string(1) "3"
+  [3]=>
+  string(1) "4"
+  [4]=>
+  string(1) "5"
+}
+Done
diff --git a/ext/oci8/tests/array_bind_011.phpt b/ext/oci8/tests/array_bind_011.phpt
new file mode 100644
index 0000000000..e8e00a8091
--- /dev/null
+++ b/ext/oci8/tests/array_bind_011.phpt
@@ -0,0 +1,67 @@
+--TEST--
+oci_bind_array_by_name(), SQLT_CHR, default max_length and empty array
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__).'/connect.inc';
+
+$drop = "DROP table bind_test";
+$statement = oci_parse($c, $drop);
+@oci_execute($statement);
+
+$create = "CREATE table bind_test(name VARCHAR(20))";
+$statement = oci_parse($c, $create);
+oci_execute($statement);
+
+$create_pkg = "
+CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+  TYPE ARRTYPE IS TABLE OF VARCHAR(20) INDEX BY BINARY_INTEGER; 
+  PROCEDURE iobind(c1 IN OUT ARRTYPE); 
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg);
+oci_execute($statement);
+
+$create_pkg_body = "
+CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+  CURSOR CUR IS SELECT name FROM bind_test;
+  PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
+    BEGIN
+    FOR i IN 1..5 LOOP
+      INSERT INTO bind_test VALUES (c1(i));
+    END LOOP;
+    IF NOT CUR%ISOPEN THEN
+      OPEN CUR;
+    END IF;
+    FOR i IN REVERSE 1..5 LOOP
+      FETCH CUR INTO c1(i);
+      IF CUR%NOTFOUND THEN
+        CLOSE CUR;
+        EXIT;
+      END IF;
+    END LOOP;
+  END iobind;
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg_body);
+oci_execute($statement);
+
+$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+
+$array = array();
+
+oci_bind_array_by_name($statement, ":c1", $array, 5, -1, SQLT_CHR);
+
+oci_execute($statement);
+
+var_dump($array);
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: oci_bind_array_by_name(): You must provide max length value for empty arrays in %s on line %d
+
+Warning: oci_execute(): ORA-01008: not all variables bound in %s on line %d
+array(0) {
+}
+Done
diff --git a/ext/oci8/tests/array_bind_012.phpt b/ext/oci8/tests/array_bind_012.phpt
new file mode 100644
index 0000000000..2208f0b3b9
--- /dev/null
+++ b/ext/oci8/tests/array_bind_012.phpt
@@ -0,0 +1,26 @@
+--TEST--
+oci_bind_array_by_name(), SQLT_CHR, default max_length and empty array
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__).'/connect.inc';
+
+$statement = oci_parse($c, 'SELECT user FROM v$session');
+
+$array = array();
+
+oci_bind_array_by_name($statement, ":c1", $array, 5, -10, SQLT_CHR);
+
+oci_execute($statement);
+
+var_dump($array);
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: oci_bind_array_by_name(): Invalid max length value (-10) in %s on line %d
+array(0) {
+}
+Done
diff --git a/ext/oci8/tests/array_bind_date1.phpt b/ext/oci8/tests/array_bind_date1.phpt
new file mode 100644
index 0000000000..ebf767570b
--- /dev/null
+++ b/ext/oci8/tests/array_bind_date1.phpt
@@ -0,0 +1,74 @@
+--TEST--
+oci_bind_array_by_name() and SQLT_ODT
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__).'/connect.inc';
+
+$drop = "DROP table bind_test";
+$statement = oci_parse($c, $drop);
+@oci_execute($statement);
+
+$create = "CREATE table bind_test(name DATE)";
+$statement = oci_parse($c, $create);
+oci_execute($statement);
+
+$create_pkg = "
+CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+  TYPE ARRTYPE IS TABLE OF DATE INDEX BY BINARY_INTEGER; 
+  PROCEDURE iobind(c1 IN OUT ARRTYPE); 
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg);
+oci_execute($statement);
+
+$create_pkg_body = "
+CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+  CURSOR CUR IS SELECT name FROM bind_test;
+  PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
+    BEGIN
+    FOR i IN 1..5 LOOP
+      INSERT INTO bind_test VALUES (c1(i));
+    END LOOP;
+    IF NOT CUR%ISOPEN THEN
+      OPEN CUR;
+    END IF;
+    FOR i IN REVERSE 1..5 LOOP
+      FETCH CUR INTO c1(i);
+      IF CUR%NOTFOUND THEN
+        CLOSE CUR;
+        EXIT;
+      END IF;
+    END LOOP;
+  END iobind;
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg_body);
+oci_execute($statement);
+
+$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+
+$array = Array("06-DEC-05","10-DEC-80","21-AUG-91","26-OCT-17","05-NOV-05");
+
+oci_bind_array_by_name($statement, ":c1", $array, 10, 5, SQLT_ODT);
+
+oci_execute($statement);
+
+var_dump($array);
+
+echo "Done\n";
+?>
+--EXPECT--	
+array(5) {
+  [0]=>
+  string(9) "05-NOV-05"
+  [1]=>
+  string(9) "26-OCT-17"
+  [2]=>
+  string(9) "21-AUG-91"
+  [3]=>
+  string(9) "10-DEC-80"
+  [4]=>
+  string(9) "06-DEC-05"
+}
+Done
diff --git a/ext/oci8/tests/array_bind_float1.phpt b/ext/oci8/tests/array_bind_float1.phpt
new file mode 100644
index 0000000000..ead85890fa
--- /dev/null
+++ b/ext/oci8/tests/array_bind_float1.phpt
@@ -0,0 +1,74 @@
+--TEST--
+oci_bind_array_by_name() and SQLT_FLT
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__).'/connect.inc';
+
+$drop = "DROP table bind_test";
+$statement = oci_parse($c, $drop);
+@oci_execute($statement);
+
+$create = "CREATE table bind_test(name FLOAT)";
+$statement = oci_parse($c, $create);
+oci_execute($statement);
+
+$create_pkg = "
+CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+  TYPE ARRTYPE IS TABLE OF FLOAT INDEX BY BINARY_INTEGER; 
+  PROCEDURE iobind(c1 IN OUT ARRTYPE); 
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg);
+oci_execute($statement);
+
+$create_pkg_body = "
+CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+  CURSOR CUR IS SELECT name FROM bind_test;
+  PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
+    BEGIN
+    FOR i IN 1..5 LOOP
+      INSERT INTO bind_test VALUES (c1(i));
+    END LOOP;
+    IF NOT CUR%ISOPEN THEN
+      OPEN CUR;
+    END IF;
+    FOR i IN REVERSE 1..5 LOOP
+      FETCH CUR INTO c1(i);
+      IF CUR%NOTFOUND THEN
+        CLOSE CUR;
+        EXIT;
+      END IF;
+    END LOOP;
+  END iobind;
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg_body);
+oci_execute($statement);
+
+$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+
+$array = Array(1.243,2.5658,3.4234,4.2123,5.9999);
+
+oci_bind_array_by_name($statement, ":c1", $array, 10, 5, SQLT_FLT);
+
+oci_execute($statement);
+
+var_dump($array);
+
+echo "Done\n";
+?>
+--EXPECT--	
+array(5) {
+  [0]=>
+  float(5.9999)
+  [1]=>
+  float(4.2123)
+  [2]=>
+  float(3.4234)
+  [3]=>
+  float(2.5658)
+  [4]=>
+  float(1.243)
+}
+Done
diff --git a/ext/oci8/tests/array_bind_int1.phpt b/ext/oci8/tests/array_bind_int1.phpt
new file mode 100644
index 0000000000..eb2072adcf
--- /dev/null
+++ b/ext/oci8/tests/array_bind_int1.phpt
@@ -0,0 +1,74 @@
+--TEST--
+oci_bind_array_by_name() and SQLT_INT
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__).'/connect.inc';
+
+$drop = "DROP table bind_test";
+$statement = oci_parse($c, $drop);
+@oci_execute($statement);
+
+$create = "CREATE table bind_test(name NUMBER)";
+$statement = oci_parse($c, $create);
+oci_execute($statement);
+
+$create_pkg = "
+CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+  TYPE ARRTYPE IS TABLE OF NUMBER INDEX BY BINARY_INTEGER; 
+  PROCEDURE iobind(c1 IN OUT ARRTYPE); 
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg);
+oci_execute($statement);
+
+$create_pkg_body = "
+CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+  CURSOR CUR IS SELECT name FROM bind_test;
+  PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
+    BEGIN
+    FOR i IN 1..5 LOOP
+      INSERT INTO bind_test VALUES (c1(i));
+    END LOOP;
+    IF NOT CUR%ISOPEN THEN
+      OPEN CUR;
+    END IF;
+    FOR i IN REVERSE 1..5 LOOP
+      FETCH CUR INTO c1(i);
+      IF CUR%NOTFOUND THEN
+        CLOSE CUR;
+        EXIT;
+      END IF;
+    END LOOP;
+  END iobind;
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg_body);
+oci_execute($statement);
+
+$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+
+$array = Array(1,2,3,4,5);
+
+oci_bind_array_by_name($statement, ":c1", $array, 10, 5, SQLT_NUM);
+
+oci_execute($statement);
+
+var_dump($array);
+
+echo "Done\n";
+?>
+--EXPECT--	
+array(5) {
+  [0]=>
+  int(5)
+  [1]=>
+  int(4)
+  [2]=>
+  int(3)
+  [3]=>
+  int(2)
+  [4]=>
+  int(1)
+}
+Done
diff --git a/ext/oci8/tests/array_bind_str1.phpt b/ext/oci8/tests/array_bind_str1.phpt
new file mode 100644
index 0000000000..af4dbfe220
--- /dev/null
+++ b/ext/oci8/tests/array_bind_str1.phpt
@@ -0,0 +1,74 @@
+--TEST--
+oci_bind_array_by_name() and SQLT_AVC
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__).'/connect.inc';
+
+$drop = "DROP table bind_test";
+$statement = oci_parse($c, $drop);
+@oci_execute($statement);
+
+$create = "CREATE table bind_test(name VARCHAR(20))";
+$statement = oci_parse($c, $create);
+oci_execute($statement);
+
+$create_pkg = "
+CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+  TYPE ARRTYPE IS TABLE OF VARCHAR(20) INDEX BY BINARY_INTEGER; 
+  PROCEDURE iobind(c1 IN OUT ARRTYPE); 
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg);
+oci_execute($statement);
+
+$create_pkg_body = "
+CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+  CURSOR CUR IS SELECT name FROM bind_test;
+  PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
+    BEGIN
+    FOR i IN 1..5 LOOP
+      INSERT INTO bind_test VALUES (c1(i));
+    END LOOP;
+    IF NOT CUR%ISOPEN THEN
+      OPEN CUR;
+    END IF;
+    FOR i IN REVERSE 1..5 LOOP
+      FETCH CUR INTO c1(i);
+      IF CUR%NOTFOUND THEN
+        CLOSE CUR;
+        EXIT;
+      END IF;
+    END LOOP;
+  END iobind;
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg_body);
+oci_execute($statement);
+
+$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+
+$array = Array("one", "two", "three", "four", "five");
+
+oci_bind_array_by_name($statement, ":c1", $array, 10, 20, SQLT_CHR);
+
+oci_execute($statement);
+
+var_dump($array);
+
+echo "Done\n";
+?>
+--EXPECT--	
+array(5) {
+  [0]=>
+  string(4) "five"
+  [1]=>
+  string(4) "four"
+  [2]=>
+  string(5) "three"
+  [3]=>
+  string(3) "two"
+  [4]=>
+  string(3) "one"
+}
+Done
diff --git a/ext/oci8/tests/execute_mode.phpt b/ext/oci8/tests/execute_mode.phpt
new file mode 100644
index 0000000000..90570cae80
--- /dev/null
+++ b/ext/oci8/tests/execute_mode.phpt
@@ -0,0 +1,19 @@
+--TEST--
+oci_execute() and invalid execute mode
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__)."/connect.inc";
+
+$pc = oci_pconnect($user, $password, $dbase);
+
+$stmt = oci_parse($pc, "select NULL from dual");
+oci_execute($stmt, -1);
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: oci_execute(): Invalid execute mode given: -1 in %s on line %d
+Done
diff --git a/ext/oci8/tests/field_funcs1.phpt b/ext/oci8/tests/field_funcs1.phpt
new file mode 100644
index 0000000000..68986e051f
--- /dev/null
+++ b/ext/oci8/tests/field_funcs1.phpt
@@ -0,0 +1,179 @@
+--TEST--
+oci_field_*() family
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__)."/connect.inc";
+require dirname(__FILE__).'/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");
+}
+
+for ($i = 0; $i<3; $i++) {
+	if (!oci_execute($s)) {
+		die("oci_execute(insert) failed!\n");
+	}
+}
+
+if (!oci_commit($c)) {
+	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");
+}
+
+if (!oci_execute($s)) {
+	die("oci_execute(select) failed!\n");
+}
+
+$row = oci_fetch_array($s, OCI_RETURN_NULLS + OCI_RETURN_LOBS);
+var_dump($row);
+
+var_dump(oci_field_is_null($s, -1));
+var_dump(oci_field_name($s, -1));
+var_dump(oci_field_type($s, -1));
+var_dump(oci_field_type_raw($s, -1));
+var_dump(oci_field_scale($s, -1));
+var_dump(oci_field_precision($s, -1));
+var_dump(oci_field_size($s, -1));
+
+var_dump(oci_field_is_null($s, "none"));
+var_dump(oci_field_name($s, "none"));
+var_dump(oci_field_type($s, "none"));
+var_dump(oci_field_type_raw($s, "none"));
+var_dump(oci_field_scale($s, "none"));
+var_dump(oci_field_precision($s, "none"));
+var_dump(oci_field_size($s, "none"));
+
+var_dump(oci_field_is_null($c, -1));
+var_dump(oci_field_name($c, -1));
+var_dump(oci_field_type($c, -1));
+var_dump(oci_field_type_raw($c, -1));
+var_dump(oci_field_scale($c, -1));
+var_dump(oci_field_precision($c, -1));
+var_dump(oci_field_size($c, -1));
+
+var_dump(oci_field_is_null($s, array()));
+var_dump(oci_field_name($s, array()));
+var_dump(oci_field_type($s, array()));
+var_dump(oci_field_type_raw($s, array()));
+var_dump(oci_field_scale($s, array()));
+var_dump(oci_field_precision($s, array()));
+var_dump(oci_field_size($s, array()));
+
+var_dump(oci_field_size($s));
+
+require dirname(__FILE__).'/drop_table.inc';
+
+echo "Done\n";
+
+?>
+--EXPECTF--
+array(5) {
+  [0]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+  [2]=>
+  NULL
+  [3]=>
+  NULL
+  [4]=>
+  NULL
+}
+
+Warning: oci_field_is_null(): Invalid column index "-1" in %s on line %d
+bool(false)
+
+Warning: oci_field_name(): Invalid column index "-1" in %s on line %d
+bool(false)
+
+Warning: oci_field_type(): Invalid column index "-1" in %s on line %d
+bool(false)
+
+Warning: oci_field_type_raw(): Invalid column index "-1" in %s on line %d
+bool(false)
+
+Warning: oci_field_scale(): Invalid column index "-1" in %s on line %d
+bool(false)
+
+Warning: oci_field_precision(): Invalid column index "-1" in %s on line %d
+bool(false)
+
+Warning: oci_field_size(): Invalid column index "-1" in %s on line %d
+bool(false)
+
+Warning: oci_field_is_null(): Invalid column name "none" in %s on line %d
+bool(false)
+
+Warning: oci_field_name(): Invalid column name "none" in %s on line %d
+bool(false)
+
+Warning: oci_field_type(): Invalid column name "none" in %s on line %d
+bool(false)
+
+Warning: oci_field_type_raw(): Invalid column name "none" in %s on line %d
+bool(false)
+
+Warning: oci_field_scale(): Invalid column name "none" in %s on line %d
+bool(false)
+
+Warning: oci_field_precision(): Invalid column name "none" in %s on line %d
+bool(false)
+
+Warning: oci_field_size(): Invalid column name "none" in %s on line %d
+bool(false)
+
+Warning: oci_field_is_null(): supplied resource is not a valid oci8 statement resource in %s on line %d
+bool(false)
+
+Warning: oci_field_name(): supplied resource is not a valid oci8 statement resource in %s on line %d
+bool(false)
+
+Warning: oci_field_type(): supplied resource is not a valid oci8 statement resource in %s on line %d
+bool(false)
+
+Warning: oci_field_type_raw(): supplied resource is not a valid oci8 statement resource in %s on line %d
+bool(false)
+
+Warning: oci_field_scale(): supplied resource is not a valid oci8 statement resource in %s on line %d
+bool(false)
+
+Warning: oci_field_precision(): supplied resource is not a valid oci8 statement resource in %s on line %d
+bool(false)
+
+Warning: oci_field_size(): supplied resource is not a valid oci8 statement resource in %s on line %d
+bool(false)
+
+Warning: oci_field_is_null(): Invalid column index "0" in %s on line %d
+bool(false)
+
+Warning: oci_field_name(): Invalid column index "0" in %s on line %d
+bool(false)
+
+Warning: oci_field_type(): Invalid column index "0" in %s on line %d
+bool(false)
+
+Warning: oci_field_type_raw(): Invalid column index "0" in %s on line %d
+bool(false)
+
+Warning: oci_field_scale(): Invalid column index "0" in %s on line %d
+bool(false)
+
+Warning: oci_field_precision(): Invalid column index "0" in %s on line %d
+bool(false)
+
+Warning: oci_field_size(): Invalid column index "0" in %s on line %d
+bool(false)
+
+Warning: oci_field_size() expects exactly 2 parameters, 1 given in %s on line %d
+bool(false)
+Done
diff --git a/ext/oci8/tests/select_null.phpt b/ext/oci8/tests/select_null.phpt
new file mode 100644
index 0000000000..20307b3e29
--- /dev/null
+++ b/ext/oci8/tests/select_null.phpt
@@ -0,0 +1,23 @@
+--TEST--
+SELECTing NULL values
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__)."/connect.inc";
+
+$pc = oci_pconnect($user, $password, $dbase);
+
+$stmt = oci_parse($pc, "select NULL from dual");
+oci_execute($stmt);
+var_dump(oci_fetch_array($stmt, OCI_RETURN_NULLS));
+
+echo "Done\n";
+?>
+--EXPECT--	
+array(1) {
+  [0]=>
+  NULL
+}
+Done