Connection cache to speed up retrieve_connection and get rid of dirty connection marking. References #428.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3218 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 7 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 4232b18450..d8cdf225d6 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -243,11 +243,17 @@ 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
-      retrieve_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