Allow DNS's to not contain a database and use what is in database.yml

Author: metaskills

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 

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -192,6 +192,7 @@ def initialize(logger,config)
         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 @@ def execute_procedure(proc_name, *variables)
         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
@@ -722,7 +728,7 @@ def recreate_database!(database=nil)
         drop_database(database)
         create_database(database)
       ensure
-        do_execute "USE #{current_db}" if this_db
+        use_database(current_db) if this_db
       end
 
       # Remove existing connections and rollback any transactions if we received the message

test/cases/connection_test_sqlserver.rb

@@ -71,6 +71,17 @@ def setup
     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

test/connections/native_sqlserver_odbc/connection.rb

@@ -10,14 +10,16 @@
     :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'
   }
 }