Skip to content

Commit a643bda

Browse files
cjbjcjbj
committed
Add new OCI8 tests. Refactor skipifs. Sync 5.3/5.4/trunk branches
1 parent 199510e commit a643bda

File tree

266 files changed

+5940
-2107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

266 files changed

+5940
-2107
lines changed

‎ext/oci8/tests/array_bind_001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ echo "Done\n";
6161
--EXPECTF--
6262
Warning: oci_bind_array_by_name(): OCI-21560: argument 3 is null, invalid, or out of range in %s on line %d
6363

64-
Warning: oci_execute(): ORA-01008: not all variables bound in %s on line %d
64+
Warning: oci_execute(): ORA-%r(01008|57000)%r: %s in %s on line %d
6565
array(1) {
6666
[0]=>
6767
string(0) ""

‎ext/oci8/tests/array_bind_002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ echo "Done\n";
6161
--EXPECTF--
6262
Warning: oci_bind_array_by_name(): Maximum array length must be greater than zero in %s on line %d
6363

64-
Warning: oci_execute(): ORA-01008: not all variables bound in %s on line %d
64+
Warning: oci_execute(): ORA-%r(01008|57000)%r: %s in %s on line %d
6565
array(5) {
6666
[0]=>
6767
string(9) "06-DEC-05"

‎ext/oci8/tests/array_bind_003.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
oci_bind_array_by_name() and invalid values 3
33
--SKIPIF--
4-
<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
4+
<?php
5+
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
6+
require(dirname(__FILE__).'/skipif.inc');
7+
?>
58
--FILE--
69
<?php
710

‎ext/oci8/tests/array_bind_004.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
oci_bind_array_by_name() and invalid values 4
33
--SKIPIF--
4-
<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
4+
<?php
5+
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
6+
require(dirname(__FILE__).'/skipif.inc');
7+
?>
58
--FILE--
69
<?php
710

‎ext/oci8/tests/array_bind_005.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
oci_bind_array_by_name() and invalid values 5
33
--SKIPIF--
4-
<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
4+
<?php
5+
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
6+
require(dirname(__FILE__).'/skipif.inc');
7+
?>
58
--FILE--
69
<?php
710

‎ext/oci8/tests/array_bind_006.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
oci_bind_array_by_name(), SQLT_CHR and default max_length
33
--SKIPIF--
4-
<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
4+
<?php
5+
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
6+
require(dirname(__FILE__).'/skipif.inc');
7+
?>
58
--FILE--
69
<?php
710

‎ext/oci8/tests/array_bind_007.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ echo "Done\n";
6161
--EXPECTF--
6262
Warning: oci_bind_array_by_name(): Unknown or unsupported datatype given: -1 in %s on line %d
6363

64-
Warning: oci_execute(): ORA-01008: not all variables bound in %s on line %d
64+
Warning: oci_execute(): ORA-%r(01008|57000)%r: %s in %s on line %d
6565
array(5) {
6666
[0]=>
6767
int(1)

‎ext/oci8/tests/array_bind_008.phpt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
oci_bind_array_by_name() and invalid values 8
33
--SKIPIF--
4-
<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
4+
<?php
5+
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
6+
require(dirname(__FILE__).'/skipif.inc');
7+
?>
58
--FILE--
69
<?php
710

@@ -60,9 +63,9 @@ echo "Done\n";
6063
?>
6164
--EXPECTF--
6265
Warning: oci_execute(): ORA-06550: line %d, column %d:
63-
PLS-00418: array bind type must match PL/SQL table row type
64-
ORA-06550: line %d, column %d:
65-
PL/SQL: Statement ignored in %s on line %d
66+
PLS-00418: %s
67+
ORA-06550: %s
68+
PL/SQL: %s
6669
array(5) {
6770
[0]=>
6871
string(1) "1"

‎ext/oci8/tests/array_bind_010.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ oci_bind_array_by_name() and invalid values 8
77

88
require dirname(__FILE__).'/connect.inc';
99

10-
$statement = oci_parse($c, 'SELECT user FROM v$session');
10+
$statement = oci_parse($c, 'SELECT user FROM all_objects');
1111

1212
$array = Array(1,2,3,4,5);
1313

‎ext/oci8/tests/array_bind_011.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ echo "Done\n";
6161
--EXPECTF--
6262
Warning: oci_bind_array_by_name(): You must provide max length value for empty arrays in %s on line %d
6363

64-
Warning: oci_execute(): ORA-01008: not all variables bound in %s on line %d
64+
Warning: oci_execute(): ORA-%r(01008|57000)%r: %s in %s on line %d
6565
array(0) {
6666
}
6767
Done

‎ext/oci8/tests/array_bind_012.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ oci_bind_array_by_name(), SQLT_CHR, default max_length and empty array
77

88
require dirname(__FILE__).'/connect.inc';
99

10-
$statement = oci_parse($c, 'SELECT user FROM v$session');
10+
$statement = oci_parse($c, 'SELECT user FROM all_objects');
1111

1212
$array = array();
1313

‎ext/oci8/tests/array_bind_014.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
oci_bind_array_by_name() and NUMBERs
33
--SKIPIF--
4-
<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
4+
<?php
5+
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
6+
require(dirname(__FILE__).'/skipif.inc');
7+
?>
58
--FILE--
69
<?php
710

‎ext/oci8/tests/array_bind_date.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
oci_bind_array_by_name() and SQLT_ODT
33
--SKIPIF--
4-
<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
4+
<?php
5+
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
6+
require(dirname(__FILE__).'/skipif.inc');
7+
?>
58
--FILE--
69
<?php
710

‎ext/oci8/tests/array_bind_date1.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
oci_bind_array_by_name() and SQLT_ODT
33
--SKIPIF--
4-
<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
4+
<?php
5+
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
6+
require(dirname(__FILE__).'/skipif.inc');
7+
?>
58
--FILE--
69
<?php
710

‎ext/oci8/tests/array_bind_float.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
oci_bind_array_by_name() and SQLT_FLT
33
--SKIPIF--
4-
<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
4+
<?php
5+
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
6+
require(dirname(__FILE__).'/skipif.inc');
7+
?>
58
--FILE--
69
<?php
710

‎ext/oci8/tests/array_bind_float1.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
oci_bind_array_by_name() and SQLT_FLT
33
--SKIPIF--
4-
<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
4+
<?php
5+
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
6+
require(dirname(__FILE__).'/skipif.inc');
7+
?>
58
--FILE--
69
<?php
710

‎ext/oci8/tests/array_bind_int.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
oci_bind_array_by_name() and SQLT_INT
33
--SKIPIF--
4-
<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
4+
<?php
5+
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
6+
require(dirname(__FILE__).'/skipif.inc');
7+
?>
58
--FILE--
69
<?php
710

‎ext/oci8/tests/array_bind_int1.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
oci_bind_array_by_name() and SQLT_INT
33
--SKIPIF--
4-
<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
4+
<?php
5+
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
6+
require(dirname(__FILE__).'/skipif.inc');
7+
?>
58
--FILE--
69
<?php
710

‎ext/oci8/tests/array_bind_str.phpt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
2-
oci_bind_array_by_name() and SQLT_AVC
2+
oci_bind_array_by_name() and SQLT_CHR
33
--SKIPIF--
4-
<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
4+
<?php
5+
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
6+
require(dirname(__FILE__).'/skipif.inc');
7+
?>
58
--FILE--
69
<?php
710

‎ext/oci8/tests/array_bind_str1.phpt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
2-
oci_bind_array_by_name() and SQLT_AVC
2+
oci_bind_array_by_name() and SQLT_CHR
33
--SKIPIF--
4-
<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
4+
<?php
5+
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
6+
require(dirname(__FILE__).'/skipif.inc');
7+
?>
58
--FILE--
69
<?php
710

‎ext/oci8/tests/b47243_1.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
Bug #47243 (Crash on exit with ZTS mode)
33
--SKIPIF--
4-
<?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); ?>
4+
<?php
5+
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
6+
require(dirname(__FILE__).'/skipif.inc');
7+
?>
58
--FILE--
69
<?php
710

‎ext/oci8/tests/b47243_2.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
Bug #47243 (Crash on exit with ZTS mode)
33
--SKIPIF--
4-
<?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); ?>
4+
<?php
5+
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
6+
require(dirname(__FILE__).'/skipif.inc');
7+
?>
58
--FILE--
69
<?php
710

‎ext/oci8/tests/b47243_3.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
Bug #47243 (Crash on exit with ZTS mode)
33
--SKIPIF--
4-
<?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); ?>
4+
<?php
5+
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
6+
require(dirname(__FILE__).'/skipif.inc');
7+
?>
58
--FILE--
69
<?php
710

‎ext/oci8/tests/bind_char_1.phpt

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,10 @@ SELECT oci_bind_by_name with SQLT_AFC aka CHAR
44
<?php
55
if (!extension_loaded('oci8')) die ("skip no oci8 extension");
66
require(dirname(__FILE__)."/connect.inc");
7-
$sv = oci_server_version($c);
8-
$sv = preg_match('/Release 1[01]\.2\./', $sv, $matches);
9-
if ($sv !== 1) {
10-
die ("skip expected output only valid when using Oracle 10gR2 or 11gR2 databases");
11-
} else {
12-
ob_start();
13-
phpinfo(INFO_MODULES);
14-
$phpinfo = ob_get_clean();
15-
$iv = preg_match('/Oracle .*Version => 1[1]\./', $phpinfo);
16-
if ($iv != 1) {
17-
die ("skip test expected to work only with Oracle 11g or greater version of client");
18-
}
7+
if (preg_match('/Release 1[01]\.2\./', oci_server_version($c), $matches) !== 1) {
8+
die("skip expected output only valid when using Oracle 10gR2 or 11gR2 databases");
9+
} else if (preg_match('/^11\./', oci_client_version()) != 1) {
10+
die("skip test expected to work only with Oracle 11g or greater version of client");
1911
}
2012
?>
2113
--FILE--
@@ -33,10 +25,7 @@ $stmtarray = array(
3325
"insert into bind_char_tab values (3, NULL, 'abc ')"
3426
);
3527

36-
foreach ($stmtarray as $stmt) {
37-
$s = oci_parse($c, $stmt);
38-
@oci_execute($s);
39-
}
28+
oci8_test_sql_execute($c, $stmtarray);
4029

4130
// Run Test
4231

@@ -206,12 +195,7 @@ $stmtarray = array(
206195
"drop table bind_char_tab"
207196
);
208197

209-
foreach ($stmtarray as $stmt) {
210-
$s = oci_parse($c, $stmt);
211-
oci_execute($s);
212-
}
213-
214-
oci_close($c);
198+
oci8_test_sql_execute($c, $stmtarray);
215199

216200
echo "Done\n";
217201

‎ext/oci8/tests/bind_char_1_11gR1.phpt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ $stmtarray = array(
2727
"insert into bind_char_tab values (3, NULL, 'abc ')"
2828
);
2929

30-
foreach ($stmtarray as $stmt) {
31-
$s = oci_parse($c, $stmt);
32-
@oci_execute($s);
33-
}
30+
oci8_test_sql_execute($c, $stmtarray);
3431

3532
// Run Test
3633

@@ -200,12 +197,7 @@ $stmtarray = array(
200197
"drop table bind_char_tab"
201198
);
202199

203-
foreach ($stmtarray as $stmt) {
204-
$s = oci_parse($c, $stmt);
205-
oci_execute($s);
206-
}
207-
208-
oci_close($c);
200+
oci8_test_sql_execute($c, $stmtarray);
209201

210202
echo "Done\n";
211203

‎ext/oci8/tests/bind_char_2.phpt

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,10 @@ SELECT oci_bind_by_name with SQLT_AFC aka CHAR and dates
44
<?php
55
if (!extension_loaded('oci8')) die ("skip no oci8 extension");
66
require(dirname(__FILE__)."/connect.inc");
7-
$sv = oci_server_version($c);
8-
$sv = preg_match('/Release 1[01]\.2\./', $sv, $matches);
9-
if ($sv !== 1) {
10-
die ("skip expected output only valid when using Oracle 10gR2 or 11gR2 databases");
11-
} else {
12-
ob_start();
13-
phpinfo(INFO_MODULES);
14-
$phpinfo = ob_get_clean();
15-
$iv = preg_match('/Oracle .*Version => 1[1]\./', $phpinfo);
16-
if ($iv != 1) {
17-
die ("skip test expected to work only with Oracle 11g or greater version of client");
18-
}
7+
if (preg_match('/Release 1[01]\.2\./', oci_server_version($c), $matches) !== 1) {
8+
die("skip expected output only valid when using Oracle 10gR2 or 11gR2 databases");
9+
} else if (preg_match('/^11\./', oci_client_version()) != 1) {
10+
die("skip test expected to work only with Oracle 11g or greater version of client");
1911
}
2012
?>
2113
--FILE--
@@ -32,10 +24,7 @@ $stmtarray = array(
3224
"insert into bind_char_tab values (1, '2008-04-20')",
3325
);
3426

35-
foreach ($stmtarray as $stmt) {
36-
$s = oci_parse($c, $stmt);
37-
@oci_execute($s);
38-
}
27+
oci8_test_sql_execute($c, $stmtarray);
3928

4029
// Run Test
4130

@@ -95,12 +84,7 @@ $stmtarray = array(
9584
"drop table bind_char_tab"
9685
);
9786

98-
foreach ($stmtarray as $stmt) {
99-
$s = oci_parse($c, $stmt);
100-
oci_execute($s);
101-
}
102-
103-
oci_close($c);
87+
oci8_test_sql_execute($c, $stmtarray);
10488

10589
echo "Done\n";
10690

0 commit comments

Comments
 (0)