diff options
author | Andrey Andreev <narf@bofh.bg> | 2013-01-24 10:32:29 +0100 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2013-01-24 10:32:29 +0100 |
commit | 1a0014941dcf399e97d3586bd6d3382166b413dd (patch) | |
tree | 03d903de3f126bf68ecfbb3d031dafe42981cdb6 /system/database/drivers/mssql/mssql_driver.php | |
parent | de5744f78c44c417f41ae01eb59488a63adabd7f (diff) |
Move db_select() call from CI_DB_driver::initialize() to db_connect()
so that it's only called by drivers that need it ('mysql', 'mssql').
As proposed in issue #2187.
Diffstat (limited to 'system/database/drivers/mssql/mssql_driver.php')
-rw-r--r-- | system/database/drivers/mssql/mssql_driver.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index f60071ed9..0836fa802 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -106,6 +106,18 @@ class CI_DB_mssql_driver extends CI_DB { return FALSE; } + // ---------------------------------------------------------------- + + // Select the DB... assuming a database name is specified in the config file + if ($this->database !== '' && ! $this->db_select()) + { + log_message('error', 'Unable to select database: '.$this->database); + + return ($this->db_debug === TRUE) + ? $this->display_error('db_unable_to_select', $this->database) + : FALSE; + } + // 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(); |