Merge pull request #2897 from rsutphin/ar31-remove_connection

Patch for issue #2820

activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb

@@ -421,7 +421,7 @@ def connected?(klass)
       # can be used as an argument for establish_connection, for easily
       # re-establishing the connection.
       def remove_connection(klass)
-        pool = @connection_pools[klass.name]
+        pool = @connection_pools.delete(klass.name)
         return nil unless pool
 
         pool.automatic_reconnect = false

activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb

@@ -126,7 +126,7 @@ def connection_config
       end
 
       def connection_pool
-        connection_handler.retrieve_connection_pool(self)
+        connection_handler.retrieve_connection_pool(self) or raise ConnectionNotEstablished
       end
 
       def retrieve_connection

activerecord/test/cases/connection_adapters/connection_handler_test.rb

@@ -6,7 +6,12 @@ class ConnectionHandlerTest < ActiveRecord::TestCase
       def setup
         @handler = ConnectionHandler.new
         @handler.establish_connection 'america', Base.connection_pool.spec
-        @klass = Struct.new(:name).new('america')
+        @klass = Class.new do
+          def self.name; 'america'; end
+        end
+        @subklass = Class.new(@klass) do
+          def self.name; 'north america'; end
+        end
       end
 
       def test_retrieve_connection
@@ -28,6 +33,20 @@ def test_retrieve_connection_pool_with_ar_base
       def test_retrieve_connection_pool
         assert_not_nil @handler.retrieve_connection_pool(@klass)
       end
+
+      def test_retrieve_connection_pool_uses_superclass_when_no_subclass_connection
+        assert_not_nil @handler.retrieve_connection_pool(@subklass)
+      end
+
+      def test_retrieve_connection_pool_uses_superclass_pool_after_subclass_establish_and_remove
+        @handler.establish_connection 'north america', Base.connection_pool.spec
+        assert_not_same @handler.retrieve_connection_pool(@klass),
+          @handler.retrieve_connection_pool(@subklass)
+
+        @handler.remove_connection @subklass
+        assert_same @handler.retrieve_connection_pool(@klass),
+          @handler.retrieve_connection_pool(@subklass)
+      end
     end
   end
 end