Fix Easy Connect string regexp and give TNS priority over it

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)
 				);