summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-13 08:30:16 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-13 08:30:16 +0100
commitfcd1f474a253cbe6e764a5c39cf5e58493670f60 (patch)
tree2e0dc763473b444748f904d89433d9e962555f41
parentdf82e686b666253e2ca02f48ccc7e485657223eb (diff)
Fix Easy Connect string regexp and give TNS priority over it
-rw-r--r--system/database/drivers/oci8/oci8_driver.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index 06acbbb67..3c70ccd9f 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -83,9 +83,9 @@ class CI_DB_oci8_driver extends CI_DB {
parent::__construct($params);
$valid_dsns = array(
- // Easy Connect string - Oracle 10g+
- 'ec' => '/^(\/\/)?[a-z0-9.:_-]+(:[1-9][0-9]{0,4})?(\/[a-z0-9$_]+)?(:[^/])?(\/[a-z0-9$_]+)?$/i',
'tns' => '/^\(DESCRIPTION=(\(.+\)){2,}\)$/', // TNS
+ // Easy Connect string (Oracle 10g+)
+ 'ec' => '/^(\/\/)?[a-z0-9.:_-]+(:[1-9][0-9]{0,4})?(\/[a-z0-9$_]+)?(:[^\/])?(\/[a-z0-9$_]+)?$/i',
'in' => '/^[a-z0-9$_]+$/i' // Instance name (defined in tnsnames.ora)
);