diff options
| author | Mike Funk <mfunk@xulonpress.com> | 2012-02-24 15:23:19 +0100 |
|---|---|---|
| committer | Mike Funk <mfunk@xulonpress.com> | 2012-02-24 15:23:19 +0100 |
| commit | baf07dd56b15e7c11025fd29a922c6cbb716da29 (patch) | |
| tree | 3f818473d1c0d011ab4a981129aff9798155d015 /system/database/drivers/mssql | |
| parent | 27a536dd3570f867ef807ab12391da032b32f09a (diff) | |
| parent | 5148029aaf204fb3e7e4f24a794bee781d0c218b (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/database/drivers/mssql')
| -rw-r--r-- | system/database/drivers/mssql/mssql_driver.php | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 2a1098932..25a32f364 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -114,14 +114,25 @@ class CI_DB_mssql_driver extends CI_DB { /** * Select the database * - * @access private called by the base class - * @return resource + * @param string database name + * @return bool */ - function db_select() + public function db_select($database = '') { + if ($database === '') + { + $database = $this->database; + } + // Note: The brackets are required in the event that the DB name // contains reserved characters - return @mssql_select_db('['.$this->database.']', $this->conn_id); + if (@mssql_select_db('['.$database.']', $this->conn_id)) + { + $this->database = $database; + return TRUE; + } + + return FALSE; } // -------------------------------------------------------------------- @@ -676,4 +687,4 @@ class CI_DB_mssql_driver extends CI_DB { /* End of file mssql_driver.php */ -/* Location: ./system/database/drivers/mssql/mssql_driver.php */
\ No newline at end of file +/* Location: ./system/database/drivers/mssql/mssql_driver.php */ |