sixd Thu, 10 Dec 2009 19:07:08 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291962
Log:
Add new 'fetch' test and make several small test fixes
Changed paths:
U php/php-src/branches/PHP_5_3/ext/oci8/tests/conn_attr.inc
U php/php-src/branches/PHP_5_3/ext/oci8/tests/driver_name.phpt
A php/php-src/branches/PHP_5_3/ext/oci8/tests/fetch_all5.phpt
U php/php-src/trunk/ext/oci8/tests/conn_attr.inc
U php/php-src/trunk/ext/oci8/tests/driver_name.phpt
A php/php-src/trunk/ext/oci8/tests/fetch_all5.phpt
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/conn_attr.inc
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/conn_attr.inc 2009-12-10 18:24:53 UTC (rev 291961)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/conn_attr.inc 2009-12-10 19:07:08 UTC (rev 291962)
@@ -36,6 +36,7 @@
$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
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/driver_name.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/driver_name.phpt 2009-12-10 18:24:53 UTC (rev 291961)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/driver_name.phpt 2009-12-10 19:07:08 UTC (rev 291962)
@@ -14,7 +14,7 @@
ob_start();
phpinfo(INFO_MODULES);
$phpinfo = ob_get_clean();
- $iv = preg_match('/Oracle .*Version => (11.2|12)\./', $phpinfo);
+ $iv = preg_match('/Oracle .*Version => (11.2|12)/', $phpinfo);
if ($iv != 1) {
die ("skip test expected to work only with Oracle 11g or greater version of client");
}
Added: php/php-src/branches/PHP_5_3/ext/oci8/tests/fetch_all5.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/fetch_all5.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/fetch_all5.phpt 2009-12-10 19:07:08 UTC (rev 291962)
@@ -0,0 +1,127 @@
+--TEST--
+Test oci_fetch_all with 0 and -1 skip & maxrows
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require(dirname(__FILE__).'/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')"
+);
+
+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
+ 942 // table or view does not exist
+ , 2289 // sequence does not exist
+ , 4080 // trigger does not exist
+ , 38802 // edition does not exist
+ ))) {
+ echo $stmt . PHP_EOL . $m['message'] . PHP_EOL;
+ }
+ }
+}
+
+// Run Test
+
+echo "Test 1\n";
+
+$s = oci_parse($c, "select * from fetch_all5_tab order by 1");
+oci_execute($s);
+$r = oci_fetch_all($s, $res, 0, -1);
+var_dump($r);
+var_dump($res);
+
+echo "Test 1\n";
+
+$s = oci_parse($c, "select * from fetch_all5_tab order by 1");
+oci_execute($s);
+$r = oci_fetch_all($s, $res, 0, 0);
+var_dump($r);
+var_dump($res);
+
+echo "Test 3\n";
+
+$s = oci_parse($c, "select * from fetch_all5_tab order by 1");
+oci_execute($s);
+$r = oci_fetch_all($s, $res, -1, 0);
+var_dump($r);
+var_dump($res);
+
+// Clean up
+
+$stmtarray = array(
+ "drop table fetch_all5_tab"
+);
+
+foreach ($stmtarray as $stmt) {
+ $s = oci_parse($c, $stmt);
+ oci_execute($s);
+}
+
+oci_close($c);
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Test 1
+int(3)
+array(2) {
+ [%u|b%"MYCOL1"]=>
+ array(3) {
+ [0]=>
+ %unicode|string%(1) "1"
+ [1]=>
+ %unicode|string%(1) "2"
+ [2]=>
+ %unicode|string%(1) "3"
+ }
+ [%u|b%"MYCOL2"]=>
+ array(3) {
+ [0]=>
+ %unicode|string%(3) "abc"
+ [1]=>
+ %unicode|string%(3) "def"
+ [2]=>
+ %unicode|string%(3) "ghi"
+ }
+}
+Test 1
+int(3)
+array(2) {
+ [%u|b%"MYCOL1"]=>
+ array(3) {
+ [0]=>
+ %unicode|string%(1) "1"
+ [1]=>
+ %unicode|string%(1) "2"
+ [2]=>
+ %unicode|string%(1) "3"
+ }
+ [%u|b%"MYCOL2"]=>
+ array(3) {
+ [0]=>
+ %unicode|string%(3) "abc"
+ [1]=>
+ %unicode|string%(3) "def"
+ [2]=>
+ %unicode|string%(3) "ghi"
+ }
+}
+Test 3
+int(0)
+array(0) {
+}
+===DONE===
Property changes on: php/php-src/branches/PHP_5_3/ext/oci8/tests/fetch_all5.phpt
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Modified: php/php-src/trunk/ext/oci8/tests/conn_attr.inc
===================================================================
--- php/php-src/trunk/ext/oci8/tests/conn_attr.inc 2009-12-10 18:24:53 UTC (rev 291961)
+++ php/php-src/trunk/ext/oci8/tests/conn_attr.inc 2009-12-10 19:07:08 UTC (rev 291962)
@@ -36,6 +36,7 @@
$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
Modified: php/php-src/trunk/ext/oci8/tests/driver_name.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/driver_name.phpt 2009-12-10 18:24:53 UTC (rev 291961)
+++ php/php-src/trunk/ext/oci8/tests/driver_name.phpt 2009-12-10 19:07:08 UTC (rev 291962)
@@ -14,7 +14,7 @@
ob_start();
phpinfo(INFO_MODULES);
$phpinfo = ob_get_clean();
- $iv = preg_match('/Oracle .*Version => (11.2|12)\./', $phpinfo);
+ $iv = preg_match('/Oracle .*Version => (11.2|12)/', $phpinfo);
if ($iv != 1) {
die ("skip test expected to work only with Oracle 11g or greater version of client");
}
Added: php/php-src/trunk/ext/oci8/tests/fetch_all5.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/fetch_all5.phpt (rev 0)
+++ php/php-src/trunk/ext/oci8/tests/fetch_all5.phpt 2009-12-10 19:07:08 UTC (rev 291962)
@@ -0,0 +1,127 @@
+--TEST--
+Test oci_fetch_all with 0 and -1 skip & maxrows
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require(dirname(__FILE__).'/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')"
+);
+
+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
+ 942 // table or view does not exist
+ , 2289 // sequence does not exist
+ , 4080 // trigger does not exist
+ , 38802 // edition does not exist
+ ))) {
+ echo $stmt . PHP_EOL . $m['message'] . PHP_EOL;
+ }
+ }
+}
+
+// Run Test
+
+echo "Test 1\n";
+
+$s = oci_parse($c, "select * from fetch_all5_tab order by 1");
+oci_execute($s);
+$r = oci_fetch_all($s, $res, 0, -1);
+var_dump($r);
+var_dump($res);
+
+echo "Test 1\n";
+
+$s = oci_parse($c, "select * from fetch_all5_tab order by 1");
+oci_execute($s);
+$r = oci_fetch_all($s, $res, 0, 0);
+var_dump($r);
+var_dump($res);
+
+echo "Test 3\n";
+
+$s = oci_parse($c, "select * from fetch_all5_tab order by 1");
+oci_execute($s);
+$r = oci_fetch_all($s, $res, -1, 0);
+var_dump($r);
+var_dump($res);
+
+// Clean up
+
+$stmtarray = array(
+ "drop table fetch_all5_tab"
+);
+
+foreach ($stmtarray as $stmt) {
+ $s = oci_parse($c, $stmt);
+ oci_execute($s);
+}
+
+oci_close($c);
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Test 1
+int(3)
+array(2) {
+ [%u|b%"MYCOL1"]=>
+ array(3) {
+ [0]=>
+ %unicode|string%(1) "1"
+ [1]=>
+ %unicode|string%(1) "2"
+ [2]=>
+ %unicode|string%(1) "3"
+ }
+ [%u|b%"MYCOL2"]=>
+ array(3) {
+ [0]=>
+ %unicode|string%(3) "abc"
+ [1]=>
+ %unicode|string%(3) "def"
+ [2]=>
+ %unicode|string%(3) "ghi"
+ }
+}
+Test 1
+int(3)
+array(2) {
+ [%u|b%"MYCOL1"]=>
+ array(3) {
+ [0]=>
+ %unicode|string%(1) "1"
+ [1]=>
+ %unicode|string%(1) "2"
+ [2]=>
+ %unicode|string%(1) "3"
+ }
+ [%u|b%"MYCOL2"]=>
+ array(3) {
+ [0]=>
+ %unicode|string%(3) "abc"
+ [1]=>
+ %unicode|string%(3) "def"
+ [2]=>
+ %unicode|string%(3) "ghi"
+ }
+}
+Test 3
+int(0)
+array(0) {
+}
+===DONE===
Property changes on: php/php-src/trunk/ext/oci8/tests/fetch_all5.phpt
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
