From 9c5c490bdc61ebd27593577480ec484f0b0f6367 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 5 Dec 2013 12:51:42 +0200 Subject: Fix some spacing issues from PR #2689 --- system/database/drivers/sqlsrv/sqlsrv_forge.php | 13 ++++--------- 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
  • Fixed a bug (#2021) - Migrations Library configuration file was mistakenly using Windows style line feeds.
  • Fixed a bug (#1273) - Active Record method set_update_batch() was using the incorrect variables and would cause an error.
  • Fixed a bug (#2337) - Email Library method print_debugger() was not using htmlspecialchars() when being shown in the browser.
  • -
  • Fixed a bug (#2689) - Database Forge Class methods create_table(), drop_table() and rename_table() were incorrect using the sqlsrv driver.
  • +
  • Fixed a bug (#2689) - Database Forge Class methods create_table(), drop_table() and rename_table() were incorrect using the sqlsrv driver.
  • -- cgit v1.2.3-24-g4f1b