0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* ActiveRecord::Base.remove_connection explicitly closes database connections and doesn't corrupt the connection cache. Introducing the disconnect! instance method for the PostgreSQL, MySQL, and SQL Server adapters; implementations for the others are welcome.  #3591 [Simon Stapleton, Tom Ward]
0
+
0
 * PostgreSQL: correctly parse negative integer column defaults.  #3776 [bellis@deepthought.org]
0
 
0
 * Show a meaningful error when the DB2 adapter cannot be loaded due to missing dependencies. [Nicholas Seckar]

0
@@ -129,12 +129,13 @@ module ActiveRecord
0
     # can be used as argument for establish_connection, for easy
0
     # re-establishing of the connection.
0
     def self.remove_connection(klass=self)
0
-      conn = @@defined_connections[klass.name]
0
-      @@defined_connections.delete(klass.name)
0
-      @@connection_cache[Thread.current.object_id].delete(klass.name)
0
-      active_connections.delete(klass.name)
0
-      @connection = nil
0
-      conn.config if conn
0
+      spec = @@defined_connections[klass.name]
0
+      konn = active_connections[klass.name]
0
+      @@defined_connections.delete_if { |key, value| value == spec }
0
+      @@connection_cache[Thread.current.object_id].delete_if { |key, value| value == konn }
0
+      active_connections.delete_if { |key, value| value == konn }
0
+      konn.disconnect! if konn
0
+      spec.config if spec
0
     end
0
 
0
     # Set the connection for the class.

0
@@ -57,11 +57,17 @@ module ActiveRecord
0
 
0
       # Is this connection active and ready to perform queries?
0
       def active?
0
-        true
0
+        @active != false
0
       end
0
 
0
       # Close this connection and open a new one in its place.
0
       def reconnect!
0
+        @active = true
0
+      end
0
+
0
+      # Close this connection
0
+      def disconnect!
0
+        @active = false
0
       end
0
 
0
 

0
@@ -160,9 +160,13 @@ module ActiveRecord
0
       end
0
 
0
       def reconnect!
0
-        @connection.close rescue nil
0
+        disconnect!
0
         connect
0
       end
0
+      
0
+      def disconnect!
0
+        @connection.close rescue nil
0
+      end
0
 
0
 
0
       # DATABASE STATEMENTS ======================================

0
@@ -75,6 +75,11 @@ module ActiveRecord
0
           configure_connection
0
         end
0
       end
0
+      
0
+      def disconnect!
0
+        # Both postgres and postgres-pr respond to :close
0
+        @connection.close rescue nil
0
+      end
0
 
0
       def native_database_types
0
         {

0
@@ -216,12 +216,18 @@ module ActiveRecord
0
 
0
       # Reconnects to the database, returns false if no connection could be made.
0
       def reconnect!
0
-        @connection.disconnect rescue nil
0
+        disconnect!
0
         @connection = DBI.connect(*@connection_options)
0
       rescue DBI::DatabaseError => e
0
         @logger.warn "#{adapter_name} reconnection failed: #{e.message}" if @logger
0
         false
0
       end
0
+      
0
+      # Disconnects from the database
0
+      
0
+      def disconnect!
0
+        @connection.disconnect rescue nil
0
+      end
0
 
0
       def select_all(sql, name = nil)
0
         select(sql, name)

0
@@ -7,19 +7,26 @@ class TestUnconnectedAdaptor < Test::Unit::TestCase
0
   self.use_transactional_fixtures = false
0
 
0
   def setup
0
-    @connection = ActiveRecord::Base.remove_connection
0
+    @underlying = ActiveRecord::Base.connection
0
+    @specification = ActiveRecord::Base.remove_connection
0
   end
0
 
0
   def teardown
0
-    ActiveRecord::Base.establish_connection(@connection)
0
+    @underlying = nil
0
+    ActiveRecord::Base.establish_connection(@specification)
0
   end
0
 
0
-  def test_unconnected
0
+  def test_connection_no_longer_established
0
     assert_raise(ActiveRecord::ConnectionNotEstablished) do
0
-      TestRecord.find(1)   
0
+      TestRecord.find(1)
0
     end
0
+
0
     assert_raise(ActiveRecord::ConnectionNotEstablished) do
0
-      TestRecord.new.save   
0
+      TestRecord.new.save
0
     end
0
   end
0
+
0
+  def test_underlying_adapter_no_longer_active
0
+    assert !@underlying.active?, "Removed adapter should no longer be active"
0
+  end
0
 end