diff options
author | Christopher Jones <sixd@php.net> | 2009-10-02 04:19:48 +0000 |
---|---|---|
committer | Christopher Jones <sixd@php.net> | 2009-10-02 04:19:48 +0000 |
commit | 460a4ceaffa242e4eecb89cc3d6f6d3c3f718172 (patch) | |
tree | d7a54b3e8e3a13903995ca3af7bcd3e263abe495 /ext | |
parent | 0f57b15e23758b0e1a1bdfe9260b50bcdb9750f2 (diff) | |
download | php-git-460a4ceaffa242e4eecb89cc3d6f6d3c3f718172.tar.gz |
Fix skipifs to accept Oracle 11.2
Diffstat (limited to 'ext')
-rw-r--r-- | ext/oci8/tests/bind_char_1.phpt | 4 | ||||
-rw-r--r-- | ext/oci8/tests/bind_char_2.phpt | 4 | ||||
-rw-r--r-- | ext/oci8/tests/bind_char_3.phpt | 4 | ||||
-rw-r--r-- | ext/oci8/tests/bind_char_4.phpt | 4 | ||||
-rw-r--r-- | ext/oci8/tests/bug27303.phpt | 4 | ||||
-rw-r--r-- | ext/oci8/tests/bug27303_2.phpt | 4 | ||||
-rw-r--r-- | ext/oci8/tests/bug27303_4.phpt | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/ext/oci8/tests/bind_char_1.phpt b/ext/oci8/tests/bind_char_1.phpt index d2dddc9086..36574dbfbb 100644 --- a/ext/oci8/tests/bind_char_1.phpt +++ b/ext/oci8/tests/bind_char_1.phpt @@ -5,9 +5,9 @@ SELECT oci_bind_by_name with SQLT_AFC aka CHAR if (!extension_loaded('oci8')) die ("skip no oci8 extension"); require(dirname(__FILE__)."/connect.inc"); $sv = oci_server_version($c); -$sv = preg_match('/11.1/', $sv, $matches); +$sv = preg_match('/Release 1[12]\./', $sv, $matches); if ($sv !== 1) { - die ("skip expected output only valid when using Oracle 11g database"); + die ("skip expected output only valid when using Oracle 11g+ database"); } ?> --FILE-- diff --git a/ext/oci8/tests/bind_char_2.phpt b/ext/oci8/tests/bind_char_2.phpt index 183c09acb4..f0f41663f5 100644 --- a/ext/oci8/tests/bind_char_2.phpt +++ b/ext/oci8/tests/bind_char_2.phpt @@ -5,9 +5,9 @@ SELECT oci_bind_by_name with SQLT_AFC aka CHAR and dates if (!extension_loaded('oci8')) die ("skip no oci8 extension"); require(dirname(__FILE__)."/connect.inc"); $sv = oci_server_version($c); -$sv = preg_match('/11.1/', $sv, $matches); +$sv = preg_match('/Release 1[12]\./', $sv, $matches); if ($sv !== 1) { - die ("skip expected output only valid when using Oracle 11g database"); + die ("skip expected output only valid when using Oracle 11g+ database"); } ?> --FILE-- diff --git a/ext/oci8/tests/bind_char_3.phpt b/ext/oci8/tests/bind_char_3.phpt index f1e6a93c0c..6d1b31150f 100644 --- a/ext/oci8/tests/bind_char_3.phpt +++ b/ext/oci8/tests/bind_char_3.phpt @@ -5,9 +5,9 @@ PL/SQL oci_bind_by_name with SQLT_AFC aka CHAR to CHAR parameter if (!extension_loaded('oci8')) die ("skip no oci8 extension"); require(dirname(__FILE__)."/connect.inc"); $sv = oci_server_version($c); -$sv = preg_match('/11.1/', $sv, $matches); +$sv = preg_match('/Release 1[12]\./', $sv, $matches); if ($sv !== 1) { - die ("skip expected output only valid when using Oracle 11g database"); + die ("skip expected output only valid when using Oracle 11g+ database"); } ?> --FILE-- diff --git a/ext/oci8/tests/bind_char_4.phpt b/ext/oci8/tests/bind_char_4.phpt index ddd07dcb29..7377604b0c 100644 --- a/ext/oci8/tests/bind_char_4.phpt +++ b/ext/oci8/tests/bind_char_4.phpt @@ -5,9 +5,9 @@ PL/SQL oci_bind_by_name with SQLT_AFC aka CHAR to VARCHAR2 parameter if (!extension_loaded('oci8')) die ("skip no oci8 extension"); require(dirname(__FILE__)."/connect.inc"); $sv = oci_server_version($c); -$sv = preg_match('/11.1/', $sv, $matches); +$sv = preg_match('/Release 1[12]\./', $sv, $matches); if ($sv !== 1) { - die ("skip expected output only valid when using Oracle 11g database"); + die ("skip expected output only valid when using Oracle 11g+ database"); } ?> --FILE-- diff --git a/ext/oci8/tests/bug27303.phpt b/ext/oci8/tests/bug27303.phpt index 2cc63d662d..4dce84463f 100644 --- a/ext/oci8/tests/bug27303.phpt +++ b/ext/oci8/tests/bug27303.phpt @@ -5,9 +5,9 @@ Bug #27303 (OCIBindByName binds numeric PHP values as characters) if (!extension_loaded('oci8')) die ("skip no oci8 extension"); require(dirname(__FILE__)."/connect.inc"); $sv = oci_server_version($c); -$sv = preg_match('/11.1/', $sv, $matches); +$sv = preg_match('/Release 1[12]\./', $sv, $matches); if ($sv !== 1) { - die ("skip expected output only valid when using Oracle 11g database"); + die ("skip expected output only valid when using Oracle 11g+ database"); } ?> --FILE-- diff --git a/ext/oci8/tests/bug27303_2.phpt b/ext/oci8/tests/bug27303_2.phpt index 3520b1ea3d..63200ed52e 100644 --- a/ext/oci8/tests/bug27303_2.phpt +++ b/ext/oci8/tests/bug27303_2.phpt @@ -5,9 +5,9 @@ Bug #27303 (OCIBindByName binds numeric PHP values as characters) if (!extension_loaded('oci8')) die ("skip no oci8 extension"); require(dirname(__FILE__)."/connect.inc"); $sv = oci_server_version($c); -$sv = preg_match('/11.1/', $sv, $matches); +$sv = preg_match('/Release 1[12]\./', $sv, $matches); if ($sv !== 1) { - die ("skip expected output only valid when using Oracle 11g database"); + die ("skip expected output only valid when using Oracle 11g+ database"); } ?> --FILE-- diff --git a/ext/oci8/tests/bug27303_4.phpt b/ext/oci8/tests/bug27303_4.phpt index f0c960e939..031f0d1e12 100644 --- a/ext/oci8/tests/bug27303_4.phpt +++ b/ext/oci8/tests/bug27303_4.phpt @@ -5,9 +5,9 @@ Bug #27303 (OCIBindByName binds numeric PHP values as characters) if (!extension_loaded('oci8')) die ("skip no oci8 extension"); require(dirname(__FILE__)."/connect.inc"); $sv = oci_server_version($c); -$sv = preg_match('/11.1/', $sv, $matches); +$sv = preg_match('/Release 1[12]\./', $sv, $matches); if ($sv !== 1) { - die ("skip expected output only valid when using Oracle 11g database"); + die ("skip expected output only valid when using Oracle 11g+ database"); } ?> --FILE-- |