diff options
| author | Andrey Andreev <narf@devilix.net> | 2013-12-05 11:51:42 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2013-12-05 11:51:42 +0100 |
| commit | 9c5c490bdc61ebd27593577480ec484f0b0f6367 (patch) | |
| tree | 4d760a63df6936c52fb7dc24f441e2e3486c6314 | |
| parent | 0704ff23c246828118a61551d51387a1e3275a4b (diff) | |
Fix some spacing issues from PR #2689
| -rw-r--r-- | system/database/drivers/sqlsrv/sqlsrv_forge.php | 13 | ||||
| -rw-r--r-- | user_guide/changelog.html | 2 |
2 files changed, 5 insertions, 10 deletions
diff --git a/system/database/drivers/sqlsrv/sqlsrv_forge.php b/system/database/drivers/sqlsrv/sqlsrv_forge.php index e65e46116..286977c52 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_forge.php +++ b/system/database/drivers/sqlsrv/sqlsrv_forge.php @@ -60,10 +60,8 @@ class CI_DB_sqlsrv_forge extends CI_DB_forge { */ function _drop_table($table) { - return = "IF (EXISTS (SELECT * - FROM INFORMATION_SCHEMA.TABLES - WHERE TABLE_SCHEMA = 'dbo' - AND TABLE_NAME = '".$table."')) DROP TABLE [dbo].[".$table."]"; + return "IF (EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'dbo' AND TABLE_NAME = '" + .$table."')) DROP TABLE [dbo].[".$table."]"; } // -------------------------------------------------------------------- @@ -81,13 +79,10 @@ class CI_DB_sqlsrv_forge extends CI_DB_forge { */ function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) { - $sql = ''; + $sql = ''; if ($if_not_exists === TRUE) { - $sql = "IF (NOT EXISTS (SELECT * - FROM INFORMATION_SCHEMA.TABLES - WHERE TABLE_SCHEMA = 'dbo' - AND TABLE_NAME = "; + $sql = "IF (NOT EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'dbo' AND TABLE_NAME = "; } $sql .= $this->db->_escape_identifiers($table).")) CREATE TABLE ".$this->db->_escape_identifiers($table)." ("; $current_field_count = 0; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index f6384fb1a..aebf52580 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -75,7 +75,7 @@ Change Log <li>Fixed a bug (#2021) - <a href="libraries/migration.html">Migrations Library</a> configuration file was mistakenly using Windows style line feeds.</li> <li>Fixed a bug (#1273) - <a href="database/active_record.html">Active Record</a> method <samp>set_update_batch()</samp> was using the incorrect variables and would cause an error.</li> <li>Fixed a bug (#2337) - <a href="libraries/email.html">Email Library</a> method <samp>print_debugger()</samp> was not using <samp>htmlspecialchars()</samp> when being shown in the browser.</li> - <li>Fixed a bug (#2689) - <a href="database/forge.html">Database Forge Class</a> methods <samp>create_table()</samp>, <samp>drop_table()</samp> and <samp>rename_table()</samp> were incorrect using the sqlsrv driver.</li> + <li>Fixed a bug (#2689) - <a href="database/forge.html">Database Forge Class</a> methods <samp>create_table()</samp>, <samp>drop_table()</samp> and <samp>rename_table()</samp> were incorrect using the sqlsrv driver.</li> </ul> |