activerecord-sqlserver-adapter 2.3.5 → 2.3.6

data/CHANGELOG

@@ -2,6 +2,15 @@
 MASTER
 
 
+* 2.3.6
+
+* Allow DNS's to not contain a database and use what is in database.yml [Marco Mastrodonato]
+
+* Rake tasks methods for vanallia rails :db namespace parity. [Ken Collins]
+
+* IronRuby integrated security fixes [Jimmy Schementi]
+
+
 * 2.3.5
 
 * Initial IronRuby ADONET connection mode support baked right in. Removed most &block 

data/README.rdoc

@@ -6,6 +6,7 @@ The SQL Server adapter for rails is back for ActiveRecord 2.2 and up! We are cur
 
 == What's New
 
+* Integration with rails :db namespaced rake tasks.
 * IronRuby support using ADONET connection mode.
 * Direct ODBC mode. No DBI anymore, means around 20% faster!
 * Now supports SQL Server 2008 too!
@@ -24,6 +25,13 @@ The SQL Server adapter for rails is back for ActiveRecord 2.2 and up! We are cur
 * Automatically reconnects to lost database connections.
 
 
+==== Testing Rake Tasks Support
+
+This is a long story, but if you are not working with a legacy database and you can trust your schema.rb to setup you local development or test database, then we have adapter level support for rails :db rake tasks. Please read this wiki page for full details.
+
+http://wiki.github.com/rails-sqlserver/2000-2005-adapter/rails-db-rake-tasks
+
+
 ==== SQL Server 2008 Support
 
 Because this adapter is primarily coded to SQL Server 2000/2005, it does not take advantage of many of the things in 2008 that would speed up the code. At some point in the future there will be a branch of this code that is specifically targeted for 2008. That adapter version will remove much of the dirty innards of this version that are meant to code around many previous SQL Server 2000/2005 short comings, the biggest being no limit/offset.

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -163,7 +163,7 @@ module ActiveRecord
     class SQLServerAdapter < AbstractAdapter
       
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '2.3.5'.freeze
+      VERSION                     = '2.3.6'.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
@@ -192,6 +192,7 @@ module ActiveRecord
         connect
         super(raw_connection, logger)
         initialize_sqlserver_caches
+        use_database
         unless SUPPORTED_VERSIONS.include?(database_year)
           raise NotImplementedError, "Currently, only #{SUPPORTED_VERSIONS.to_sentence} are supported."
         end
@@ -401,6 +402,11 @@ module ActiveRecord
         end
       end
       
+      def use_database(database=nil)
+        database ||= @connection_options[:database]
+        do_execute "USE #{database}" unless database.blank?
+      end
+      
       def outside_transaction?
         info_schema_query { select_value("SELECT @@TRANCOUNT") == 0 }
       end
@@ -664,7 +670,7 @@ module ActiveRecord
       end
       
       def remove_index(table_name, options = {})
-        do_execute "DROP INDEX #{table_name}.#{quote_column_name(index_name(table_name, options))}"
+        do_execute "DROP INDEX #{table_name}.#{quote_column_name(index_name(table_name, options))}" rescue nil
       end
       
       def type_to_sql(type, limit = nil, precision = nil, scale = nil)
@@ -707,30 +713,36 @@ module ActiveRecord
       end
       
       # RAKE UTILITY METHODS =====================================#
-
-      def recreate_database(name)
-        existing_database = current_database.to_s
-        if name.to_s == existing_database
-          do_execute 'USE master' 
+      
+      def recreate_database
+        remove_database_connections_and_rollback do
+          do_execute "EXEC sp_MSforeachtable 'DROP TABLE ?'"
         end
-        drop_database(name)
-        create_database(name)
+      end
+      
+      def recreate_database!(database=nil)
+        current_db = current_database
+        database ||= current_db
+        this_db = database.to_s == current_db
+        do_execute 'USE master' if this_db
+        drop_database(database)
+        create_database(database)
       ensure
-        do_execute "USE #{existing_database}" if name.to_s == existing_database 
+        use_database(current_db) if this_db
       end
-
-      def drop_database(name)
+      
+      # Remove existing connections and rollback any transactions if we received the message
+      # 'Cannot drop the database 'test' because it is currently in use'
+      def drop_database(database)
         retry_count = 0
         max_retries = 1
         begin
-          do_execute "DROP DATABASE #{name}"
+          do_execute "DROP DATABASE #{database}"
         rescue ActiveRecord::StatementInvalid => err
-          # Remove existing connections and rollback any transactions if we received the message
-          #  'Cannot drop the database 'test' because it is currently in use'
-          if err.message =~ /because it is currently in use/
+          if err.message =~ /because it is currently in use/i
             raise if retry_count >= max_retries
             retry_count += 1
-            remove_database_connections_and_rollback(name)
+            remove_database_connections_and_rollback(database)
             retry
           else
             raise
@@ -738,18 +750,28 @@ module ActiveRecord
         end
       end
 
-      def create_database(name)
-        do_execute "CREATE DATABASE #{name}"
+      def create_database(database)
+        do_execute "CREATE DATABASE #{database}"
       end
       
       def current_database
         select_value 'SELECT DB_NAME()'
       end
-
-      def remove_database_connections_and_rollback(name)
-        # This should disconnect all other users and rollback any transactions for SQL 2000 and 2005
-        # http://sqlserver2000.databases.aspfaq.com/how-do-i-drop-a-sql-server-database.html
-        do_execute "ALTER DATABASE #{name} SET SINGLE_USER WITH ROLLBACK IMMEDIATE"
+      
+      def charset
+        select_value "SELECT SERVERPROPERTY('SqlCharSetName')"
+      end
+      
+      # This should disconnect all other users and rollback any transactions for SQL 2000 and 2005
+      # 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"
+        begin
+          yield
+        ensure
+          do_execute "ALTER DATABASE #{database} SET MULTI_USER"
+        end if block_given?
       end
       
       
@@ -766,9 +788,12 @@ module ActiveRecord
                       when :adonet
                         System::Data::SqlClient::SqlConnection.new.tap do |connection|
                           connection.connection_string = System::Data::SqlClient::SqlConnectionStringBuilder.new.tap do |cs|
-                            cs.user_i_d = config[:username] if config[:username]
-                            cs.password = config[:password] if config[:password]
-                            cs.integrated_security = true if config[:integrated_security] == 'true'
+                            if config[:integrated_security]
+                              cs.integrated_security = true
+                            else
+                              cs.user_i_d = config[:username]
+                              cs.password = config[:password]
+                            end
                             cs.add 'Server', config[:host].to_clr_string
                             cs.initial_catalog = config[:database]
                             cs.multiple_active_result_sets = false

data/test/cases/connection_test_sqlserver.rb

@@ -71,6 +71,17 @@ class ConnectionTestSqlserver < ActiveRecord::TestCase
     end
   end
   
+  should 'allow usage of :database connection option to remove setting from dsn' do
+    assert_equal 'activerecord_unittest', @connection.current_database
+    begin
+      @connection.use_database('activerecord_unittest2')
+      assert_equal 'activerecord_unittest2', @connection.current_database
+    ensure
+      @connection.use_database
+      assert_equal 'activerecord_unittest', @connection.current_database, 'Would default back to connection options'
+    end
+  end
+  
   context 'Connection management' do
     
     setup do

data/test/connections/native_sqlserver_odbc/connection.rb

@@ -10,14 +10,16 @@ ActiveRecord::Base.configurations = {
     :mode     => 'ODBC',
     :host     => 'localhost',
     :username => 'rails',
-    :dsn => 'activerecord_unittest'
+    :dsn      => 'activerecord_unittest',
+    :database => 'activerecord_unittest'
   },
   'arunit2' => {
     :adapter  => 'sqlserver',
     :mode     => 'ODBC',
     :host     => 'localhost',
     :username => 'rails',
-    :dsn => 'activerecord_unittest2'
+    :dsn      => 'activerecord_unittest2',
+    :database => 'activerecord_unittest2'
   }
 }
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 3
-  - 5
-  version: 2.3.5
+  - 6
+  version: 2.3.6
 platform: ruby
 authors: 
 - Ken Collins