diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-10-12 16:16:35 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-10-12 16:16:35 +0200 |
| commit | 3013f53c59a5d2550a126b1493cf8262bd62dd53 (patch) | |
| tree | 772e9b569a65e8567c366671373a2700c2028445 /system/database/drivers/sqlsrv/sqlsrv_driver.php | |
| parent | 30f593bbb3408d0c076f2453818c68a7c5c59248 (diff) | |
| parent | 36a055e49b040e6f18be7bce5e010c2a90d2f44f (diff) | |
Merge branch '3.0-stable' into develop
Diffstat (limited to 'system/database/drivers/sqlsrv/sqlsrv_driver.php')
| -rw-r--r-- | system/database/drivers/sqlsrv/sqlsrv_driver.php | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/system/database/drivers/sqlsrv/sqlsrv_driver.php b/system/database/drivers/sqlsrv/sqlsrv_driver.php index 16f77fab2..8d383b274 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_driver.php +++ b/system/database/drivers/sqlsrv/sqlsrv_driver.php @@ -141,13 +141,14 @@ class CI_DB_sqlsrv_driver extends CI_DB { unset($connection['UID'], $connection['PWD']); } - $this->conn_id = sqlsrv_connect($this->hostname, $connection); - - // Determine how identifiers are escaped - $query = $this->query('SELECT CASE WHEN (@@OPTIONS | 256) = @@OPTIONS THEN 1 ELSE 0 END AS qi'); - $query = $query->row_array(); - $this->_quoted_identifier = empty($query) ? FALSE : (bool) $query['qi']; - $this->_escape_char = ($this->_quoted_identifier) ? '"' : array('[', ']'); + if (FALSE !== ($this->conn_id = sqlsrv_connect($this->hostname, $connection))) + { + // Determine how identifiers are escaped + $query = $this->query('SELECT CASE WHEN (@@OPTIONS | 256) = @@OPTIONS THEN 1 ELSE 0 END AS qi'); + $query = $query->row_array(); + $this->_quoted_identifier = empty($query) ? FALSE : (bool) $query['qi']; + $this->_escape_char = ($this->_quoted_identifier) ? '"' : array('[', ']'); + } return $this->conn_id; } |