From 3ed6675c68f5c0531024d160a5bbe2c706b383cc Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 5 Dec 2005 21:48:23 +0000
Subject: [PATCH] Clear the connection cache entry when a new connection is
 established on the same class.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3222 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 activerecord/lib/active_record/base.rb        | 20 ---------------
 .../abstract/connection_specification.rb      | 25 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index d8cdf225d6..27b2de6f8d 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -243,26 +243,6 @@ module ActiveRecord #:nodoc:
     # on to any new database connections made and which can be retrieved on both a class and instance level by calling +logger+.
     cattr_accessor :logger
 
-    @@connection_cache = Hash.new { |h, k| h[k] = Hash.new }
-
-    # Returns the connection currently associated with the class. This can
-    # also be used to "borrow" the connection to do database work unrelated
-    # to any of the specific Active Records.
-    def self.connection
-      @@connection_cache[Thread.current.object_id][name] ||= retrieve_connection
-    end
-
-    def self.clear_connection_cache!
-      @@connection_cache.clear
-    end
-
-    # Returns the connection currently associated with the class. This can
-    # also be used to "borrow" the connection to do database work that isn't
-    # easily done without going straight to SQL.
-    def connection
-      self.class.connection
-    end
-
     def self.inherited(child) #:nodoc:
       @@subclasses[self] ||= []
       @@subclasses[self] << child
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
index 4ef31e8beb..023b67d92a 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
@@ -11,6 +11,28 @@ module ActiveRecord
     # The class -> [adapter_method, config] map
     @@defined_connections = {}
 
+    # The class -> thread id -> adapter cache.
+    @@connection_cache = Hash.new { |h, k| h[k] = Hash.new }
+
+    # Returns the connection currently associated with the class. This can
+    # also be used to "borrow" the connection to do database work unrelated
+    # to any of the specific Active Records.
+    def self.connection
+      @@connection_cache[Thread.current.object_id][name] ||= retrieve_connection
+    end
+
+    # Clears the cache which maps classes to connections.
+    def self.clear_connection_cache!
+      @@connection_cache.clear
+    end
+
+    # Returns the connection currently associated with the class. This can
+    # also be used to "borrow" the connection to do database work that isn't
+    # easily done without going straight to SQL.
+    def connection
+      self.class.connection
+    end
+
     # Establishes the connection to the database. Accepts a hash as input where
     # the :adapter key must be specified with the name of a database adapter (in lower-case)
     # example for regular databases (MySQL, Postgresql, etc):
@@ -111,7 +133,8 @@ module ActiveRecord
     def self.remove_connection(klass=self)
       conn = @@defined_connections[klass.name]
       @@defined_connections.delete(klass.name)
-      active_connections[klass.name] = nil
+      @@connection_cache[Thread.current.object_id].delete(klass.name)
+      active_connections.delete(klass.name)
       @connection = nil
       conn.config if conn
     end