Changeset 3222

Timestamp:

12/05/05 21:48:23 (3 years ago)

Author:

bitsweat

Message:

Clear the connection cache entry when a new connection is established on the same class.

Files:

• trunk/activerecord/lib/active_record/base.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb (modified) (2 diffs)

trunk/activerecord/lib/active_record/base.rb

@@ -244 +244 @@
-    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] ||= []

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

@@ -11 +11 @@
-    # 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
@@ -112 +134 @@
-      conn = @@defined_connections[klass.name]
-      @@defined_connections.delete(klass.name)
-
+
+
-      @connection = nil
-      conn.config if conn