Properly quote all database names in rake helper methods.

Author: metaskills

CHANGELOG

@@ -1,6 +1,10 @@
 
 MASTER
 
+* 2.3.8
+
+* Properly quote all database names in rake helper methods. [Ken Collins]
+
 
 * 2.3.7
 

activerecord-sqlserver-adapter.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "activerecord-sqlserver-adapter"
-  s.version  = "2.3.7"
-  s.date     = "2010-02-17"
+  s.version  = "2.3.8"
+  s.date     = "2010-06-07"
   s.summary  = "SQL Server 2000, 2005 and 2008 Adapter For Rails."
   s.email    = "ken@metaskills.net"
   s.homepage = "http://github.com/rails-sqlserver"

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -170,7 +170,7 @@ def simplified_datetime
     class SQLServerAdapter < AbstractAdapter
 
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '2.3.7'.freeze
+      VERSION                     = '2.3.8'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+(\d{4})/
       SUPPORTED_VERSIONS          = [2000,2005,2008].freeze
       LIMITABLE_TYPES             = ['string','integer','float','char','nchar','varchar','nvarchar'].freeze
@@ -420,7 +420,7 @@ def execute_procedure(proc_name, *variables)
 
       def use_database(database=nil)
         database ||= @connection_options[:database]
-        do_execute "USE #{database}" unless database.blank?
+        do_execute "USE #{quote_table_name(database)}" unless database.blank?
       end
 
       def outside_transaction?
@@ -753,7 +753,7 @@ def drop_database(database)
         retry_count = 0
         max_retries = 1
         begin
-          do_execute "DROP DATABASE #{database}"
+          do_execute "DROP DATABASE #{quote_table_name(database)}"
         rescue ActiveRecord::StatementInvalid => err
           if err.message =~ /because it is currently in use/i
             raise if retry_count >= max_retries
@@ -767,7 +767,7 @@ def drop_database(database)
       end
 
       def create_database(database)
-        do_execute "CREATE DATABASE #{database}"
+        do_execute "CREATE DATABASE #{quote_table_name(database)}"
       end
 
       def current_database
@@ -782,11 +782,11 @@ def charset
       # http://sqlserver2000.databases.aspfaq.com/how-do-i-drop-a-sql-server-database.html
       def remove_database_connections_and_rollback(database=nil)
         database ||= current_database
-        do_execute "ALTER DATABASE #{database} SET SINGLE_USER WITH ROLLBACK IMMEDIATE"
+        do_execute "ALTER DATABASE #{quote_table_name(database)} SET SINGLE_USER WITH ROLLBACK IMMEDIATE"
         begin
           yield
         ensure
-          do_execute "ALTER DATABASE #{database} SET MULTI_USER"
+          do_execute "ALTER DATABASE #{quote_table_name(database)} SET MULTI_USER"
         end if block_given?
       end
 

test/connections/native_sqlserver_odbc/connection.rb

@@ -10,15 +10,15 @@
     :mode     => 'ODBC',
     :host     => 'localhost',
     :username => 'rails',
-    :dsn      => 'activerecord_unittest',
+    :dsn      => ENV['ACTIVERECORD_UNITTEST_DSN'] || 'activerecord_unittest',
     :database => 'activerecord_unittest'
   },
   'arunit2' => {
     :adapter  => 'sqlserver',
     :mode     => 'ODBC',
     :host     => 'localhost',
     :username => 'rails',
-    :dsn      => 'activerecord_unittest2',
+    :dsn      => ENV['ACTIVERECORD_UNITTEST2_DSN'] || 'activerecord_unittest2',
     :database => 'activerecord_unittest2'
   }
 }