summaryrefslogtreecommitdiff
path: root/ext/oci8
diff options
context:
space:
mode:
Diffstat (limited to 'ext/oci8')
-rw-r--r--ext/oci8/oci8.c2
-rw-r--r--ext/oci8/oci8_collection.c2
-rw-r--r--ext/oci8/oci8_failover.c2
-rw-r--r--ext/oci8/oci8_interface.c2
-rw-r--r--ext/oci8/oci8_lob.c2
-rw-r--r--ext/oci8/oci8_statement.c2
-rw-r--r--ext/oci8/package.xml4
-rw-r--r--ext/oci8/php_oci8.h2
-rw-r--r--ext/oci8/php_oci8_int.h2
-rw-r--r--ext/oci8/tests/default_prefetch.phpt53
-rw-r--r--ext/oci8/tests/fetch_all.phpt94
11 files changed, 10 insertions, 157 deletions
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 9e559b783a..af1b44a458 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -21,7 +21,7 @@
| ZTS per process OCIPLogon by Harald Radi <harald.radi@nme.at> |
| |
| Redesigned by: Antony Dovgal <antony@zend.com> |
- | Andi Gutmans <andi@zend.com> |
+ | Andi Gutmans <andi@php.net> |
| Wez Furlong <wez@omniti.com> |
+----------------------------------------------------------------------+
*/
diff --git a/ext/oci8/oci8_collection.c b/ext/oci8/oci8_collection.c
index 7ddda06bb2..f9dcccb2f2 100644
--- a/ext/oci8/oci8_collection.c
+++ b/ext/oci8/oci8_collection.c
@@ -20,7 +20,7 @@
| ZTS per process OCIPLogon by Harald Radi <harald.radi@nme.at> |
| |
| Redesigned by: Antony Dovgal <antony@zend.com> |
- | Andi Gutmans <andi@zend.com> |
+ | Andi Gutmans <andi@php.net> |
| Wez Furlong <wez@omniti.com> |
+----------------------------------------------------------------------+
*/
diff --git a/ext/oci8/oci8_failover.c b/ext/oci8/oci8_failover.c
index ab27997458..34033ee66e 100644
--- a/ext/oci8/oci8_failover.c
+++ b/ext/oci8/oci8_failover.c
@@ -20,7 +20,7 @@
| ZTS per process OCIPLogon by Harald Radi <harald.radi@nme.at> |
| |
| Redesigned by: Antony Dovgal <antony@zend.com> |
- | Andi Gutmans <andi@zend.com> |
+ | Andi Gutmans <andi@php.net> |
| Wez Furlong <wez@omniti.com> |
+----------------------------------------------------------------------+
*/
diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c
index 82cb30bfbf..06fd913b3f 100644
--- a/ext/oci8/oci8_interface.c
+++ b/ext/oci8/oci8_interface.c
@@ -20,7 +20,7 @@
| ZTS per process OCIPLogon by Harald Radi <harald.radi@nme.at> |
| |
| Redesigned by: Antony Dovgal <antony@zend.com> |
- | Andi Gutmans <andi@zend.com> |
+ | Andi Gutmans <andi@php.net> |
| Wez Furlong <wez@omniti.com> |
+----------------------------------------------------------------------+
*/
diff --git a/ext/oci8/oci8_lob.c b/ext/oci8/oci8_lob.c
index 7320bca899..aaf4563cf5 100644
--- a/ext/oci8/oci8_lob.c
+++ b/ext/oci8/oci8_lob.c
@@ -20,7 +20,7 @@
| ZTS per process OCIPLogon by Harald Radi <harald.radi@nme.at> |
| |
| Redesigned by: Antony Dovgal <antony@zend.com> |
- | Andi Gutmans <andi@zend.com> |
+ | Andi Gutmans <andi@php.net> |
| Wez Furlong <wez@omniti.com> |
+----------------------------------------------------------------------+
*/
diff --git a/ext/oci8/oci8_statement.c b/ext/oci8/oci8_statement.c
index d80bb5f1d7..68ee6b5762 100644
--- a/ext/oci8/oci8_statement.c
+++ b/ext/oci8/oci8_statement.c
@@ -20,7 +20,7 @@
| ZTS per process OCIPLogon by Harald Radi <harald.radi@nme.at> |
| |
| Redesigned by: Antony Dovgal <antony@zend.com> |
- | Andi Gutmans <andi@zend.com> |
+ | Andi Gutmans <andi@php.net> |
| Wez Furlong <wez@omniti.com> |
+----------------------------------------------------------------------+
*/
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index 07a56800bb..1dad9a41c3 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -167,6 +167,8 @@ Fixed reference counting and memory issues. (Dmitry, Tianfang)
<file name="bug51291_1.phpt" role="test" />
<file name="bug51291_2.phpt" role="test" />
<file name="bug68298.phpt" role="test" />
+ <file name="bug70700.phpt" role="test" />
+ <file name="bug71148.phpt" role="test" />
<file name="bug71422.phpt" role="test" />
<file name="bug71600.phpt" role="test" />
<file name="bug72524.phpt" role="test" />
@@ -242,7 +244,6 @@ Fixed reference counting and memory issues. (Dmitry, Tianfang)
<file name="db_op_2.phpt" role="test" />
<file name="dbmsoutput.phpt" role="test" />
<file name="debug.phpt" role="test" />
- <file name="default_prefetch.phpt" role="test" />
<file name="default_prefetch0.phpt" role="test" />
<file name="default_prefetch1.phpt" role="test" />
<file name="default_prefetch2.phpt" role="test" />
@@ -297,7 +298,6 @@ Fixed reference counting and memory issues. (Dmitry, Tianfang)
<file name="extauth_03.phpt" role="test" />
<file name="extauth_04.phpt" role="test" />
<file name="fetch.phpt" role="test" />
- <file name="fetch_all.phpt" role="test" />
<file name="fetch_all1.phpt" role="test" />
<file name="fetch_all2.phpt" role="test" />
<file name="fetch_all3.phpt" role="test" />
diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
index 8f66cfbc9b..0df48207a5 100644
--- a/ext/oci8/php_oci8.h
+++ b/ext/oci8/php_oci8.h
@@ -20,7 +20,7 @@
| ZTS per process OCIPLogon by Harald Radi <harald.radi@nme.at> |
| |
| Redesigned by: Antony Dovgal <antony@zend.com> |
- | Andi Gutmans <andi@zend.com> |
+ | Andi Gutmans <andi@php.net> |
| Wez Furlong <wez@omniti.com> |
+----------------------------------------------------------------------+
*/
diff --git a/ext/oci8/php_oci8_int.h b/ext/oci8/php_oci8_int.h
index 8455277e59..577a315817 100644
--- a/ext/oci8/php_oci8_int.h
+++ b/ext/oci8/php_oci8_int.h
@@ -20,7 +20,7 @@
| ZTS per process OCIPLogon by Harald Radi <harald.radi@nme.at> |
| |
| Redesigned by: Antony Dovgal <antony@zend.com> |
- | Andi Gutmans <andi@zend.com> |
+ | Andi Gutmans <andi@php.net> |
| Wez Furlong <wez@omniti.com> |
+----------------------------------------------------------------------+
*/
diff --git a/ext/oci8/tests/default_prefetch.phpt b/ext/oci8/tests/default_prefetch.phpt
deleted file mode 100644
index 5d2934e4cb..0000000000
--- a/ext/oci8/tests/default_prefetch.phpt
+++ /dev/null
@@ -1,53 +0,0 @@
---TEST--
-oci8.default_prefetch ini option
---SKIPIF--
-<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---INI--
-oci8.default_prefetch=20
---FILE--
-<?php
-
-require(dirname(__FILE__)."/connect.inc");
-
-// Initialize
-
-$stmtarray = array(
- "drop table default_prefetch_tab",
- "create table default_prefetch_tab (id number, value number)",
- "insert into default_prefetch_tab (id, value) values (1,1)",
- "insert into default_prefetch_tab (id, value) values (1,1)",
- "insert into default_prefetch_tab (id, value) values (1,1)",
-);
-
-oci8_test_sql_execute($c, $stmtarray);
-
-// Run Test
-
-$select_sql = "select * from default_prefetch_tab";
-
-if (!($s = oci_parse($c, $select_sql))) {
- die("oci_parse(select) failed!\n");
-}
-
-if (!oci_execute($s)) {
- die("oci_execute(select) failed!\n");
-}
-
-var_dump(oci_fetch($s));
-
-var_dump(oci_num_rows($s));
-
-// Cleanup
-
-$stmtarray = array(
- "drop table default_prefetch_tab"
-);
-
-oci8_test_sql_execute($c, $stmtarray);
-
-echo "Done\n";
-?>
---EXPECT--
-bool(true)
-int(1)
-Done
diff --git a/ext/oci8/tests/fetch_all.phpt b/ext/oci8/tests/fetch_all.phpt
deleted file mode 100644
index fe34bd8ece..0000000000
--- a/ext/oci8/tests/fetch_all.phpt
+++ /dev/null
@@ -1,94 +0,0 @@
---TEST--
-oci_fetch_all()
---SKIPIF--
-<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---FILE--
-<?php
-
-require(dirname(__FILE__)."/connect.inc");
-
-// Initialize
-
-$stmtarray = array(
- "drop table fetch_all_tab",
- "create table fetch_all_tab (id number, value number)",
- "insert into fetch_all_tab (id, value) values (1,1)",
- "insert into fetch_all_tab (id, value) values (1,1)",
- "insert into fetch_all_tab (id, value) values (1,1)"
-);
-
-oci8_test_sql_execute($c, $stmtarray);
-
-if (!($s = oci_parse($c, "select * from fetch_all_tab"))) {
- die("oci_parse(select) failed!\n");
-}
-
-/* oci_fetch_all */
-if (!oci_execute($s)) {
- die("oci_execute(select) failed!\n");
-}
-var_dump(oci_fetch_all($s, $all));
-var_dump($all);
-
-/* ocifetchstatement */
-if (!oci_execute($s)) {
- die("oci_execute(select) failed!\n");
-}
-
-var_dump(ocifetchstatement($s, $all));
-var_dump($all);
-
-// Cleanup
-
-$stmtarray = array(
- "drop table fetch_all_tab"
-);
-
-oci8_test_sql_execute($c, $stmtarray);
-
-echo "Done\n";
-?>
---EXPECTF--
-int(3)
-array(2) {
- ["ID"]=>
- array(3) {
- [0]=>
- string(1) "1"
- [1]=>
- string(1) "1"
- [2]=>
- string(1) "1"
- }
- ["VALUE"]=>
- array(3) {
- [0]=>
- string(1) "1"
- [1]=>
- string(1) "1"
- [2]=>
- string(1) "1"
- }
-}
-int(3)
-array(2) {
- ["ID"]=>
- array(3) {
- [0]=>
- string(1) "1"
- [1]=>
- string(1) "1"
- [2]=>
- string(1) "1"
- }
- ["VALUE"]=>
- array(3) {
- [0]=>
- string(1) "1"
- [1]=>
- string(1) "1"
- [2]=>
- string(1) "1"
- }
-}
-Done
View Lorry Controller Status