diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-02-24 10:50:49 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-02-24 10:50:49 +0100 |
| commit | 5148029aaf204fb3e7e4f24a794bee781d0c218b (patch) | |
| tree | 74e3a0ea7160f83f7ff1188f66e018b7490562a7 /system/database/drivers/sqlsrv/sqlsrv_driver.php | |
| parent | e2675736f3a68b1f64e135d827f6a70e0ae892fb (diff) | |
| parent | 024ba2dffd49e26f68468acd69feebd685f63f68 (diff) | |
Merge pull request #1069 from narfbg/develop-db-select
Add an optional database name parameter to db_select()
Diffstat (limited to 'system/database/drivers/sqlsrv/sqlsrv_driver.php')
| -rw-r--r-- | system/database/drivers/sqlsrv/sqlsrv_driver.php | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/system/database/drivers/sqlsrv/sqlsrv_driver.php b/system/database/drivers/sqlsrv/sqlsrv_driver.php index 6fd52ef70..9c50209ec 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_driver.php +++ b/system/database/drivers/sqlsrv/sqlsrv_driver.php @@ -122,12 +122,23 @@ class CI_DB_sqlsrv_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 = '') { - return $this->_execute('USE ' . $this->database); + if ($database === '') + { + $database = $this->database; + } + + if ($this->_execute('USE '.$database)) + { + $this->database = $database; + return TRUE; + } + + return FALSE; } // -------------------------------------------------------------------- @@ -608,4 +619,4 @@ class CI_DB_sqlsrv_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 */ |