Skip to content

Commit 423b132

Browse files
committed
Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries.
(note OCI8 already builds with Oracle Database 12c)
1 parent 38eb909 commit 423b132

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ext/pdo_oci/config.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ dnl $Id$
22
dnl config.m4 for extension pdo_oci
33
dnl vim:et:sw=2:ts=2:
44

5-
SUPPORTED_LIB_VERS="9.0 10.1 11.1" # This caters for all Oracle 9.x, 10.x and 11.1 installs
5+
SUPPORTED_LIB_VERS="9.0 10.1 11.1 12.1" # The lib vers are not bumped when the DB version is bumped
66
AC_DEFUN([AC_PDO_OCI_VERSION],[
77
AC_MSG_CHECKING([Oracle version])
88
for OCI_VER in $SUPPORTED_LIB_VERS; do
@@ -147,7 +147,7 @@ You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_
147147
fi
148148

149149
case $PDO_OCI_VERSION in
150-
9.0|10.1|10.2|11.1|11.2)
150+
9.0|10.1|10.2|11.1|11.2|12.1)
151151
PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD)
152152
;;
153153

ext/pdo_oci/tests/pdo_oci_attr_client.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $cv = $dbh->getAttribute(PDO::ATTR_CLIENT_VERSION);
1818
var_dump($cv);
1919

2020
$s = explode(".", $cv);
21-
if ($s[0] >= 10 && count($s) > 1 && $s[1] >= 2) {
21+
if (count($s) > 1 && (($s[0] == 10 && $s[1] >= 2) || $s[0] >= 11)) {
2222
if (count($s) != 5) {
2323
echo "Wrong number of values in array\nVersion was: ";
2424
var_dump($cv);

0 commit comments

Comments
 (0)