From ba1544d71628abff2777c9c514142d7e9a159111 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Fri, 31 Aug 2012 12:56:27 +0100
Subject: One hash is enough

We don't need separate @class_to_pool and @connection_pool hashes.
---
 .../abstract/connection_pool.rb                    | 30 ++++++++++------------
 activerecord/lib/active_record/fixtures.rb         |  2 +-
 2 files changed, 14 insertions(+), 18 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index ed8f274cdb..09a2c28351 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -496,40 +496,38 @@ module ActiveRecord
     # ActiveRecord::Base.connection_handler. Active Record models use this to
     # determine that connection pool that they should use.
     class ConnectionHandler
-      def initialize(pools = Hash.new { |h,k| h[k] = {} })
-        @connection_pools = pools
-        @class_to_pool    = Hash.new { |h,k| h[k] = {} }
+      def initialize
+        @class_to_pool = Hash.new { |h,k| h[k] = {} }
       end
 
       def connection_pools
-        @connection_pools[Process.pid]
+        class_to_pool.values.compact
       end
 
       def establish_connection(klass, spec)
-        class_to_pool[klass] =
-          connection_pools[spec] = ConnectionAdapters::ConnectionPool.new(spec)
+        class_to_pool[klass] = ConnectionAdapters::ConnectionPool.new(spec)
       end
 
       # Returns true if there are any active connections among the connection
       # pools that the ConnectionHandler is managing.
       def active_connections?
-        connection_pools.values.any? { |pool| pool.active_connection? }
+        connection_pools.any?(&:active_connection?)
       end
 
       # Returns any connections in use by the current thread back to the pool,
       # and also returns connections to the pool cached by threads that are no
       # longer alive.
       def clear_active_connections!
-        connection_pools.each_value {|pool| pool.release_connection }
+        connection_pools.each(&:release_connection)
       end
 
       # Clears the cache which maps classes.
       def clear_reloadable_connections!
-        connection_pools.each_value {|pool| pool.clear_reloadable_connections! }
+        connection_pools.each(&:clear_reloadable_connections!)
       end
 
       def clear_all_connections!
-        connection_pools.each_value {|pool| pool.disconnect! }
+        connection_pools.each(&:disconnect!)
       end
 
       # Locate the connection of the nearest super class. This can be an
@@ -553,13 +551,11 @@ module ActiveRecord
       # can be used as an argument for establish_connection, for easily
       # re-establishing the connection.
       def remove_connection(klass)
-        pool = class_to_pool.delete(klass)
-        return nil unless pool
-
-        connection_pools.delete pool.spec
-        pool.automatic_reconnect = false
-        pool.disconnect!
-        pool.spec.config
+        if pool = class_to_pool.delete(klass)
+          pool.automatic_reconnect = false
+          pool.disconnect!
+          pool.spec.config
+        end
       end
 
       def retrieve_connection_pool(klass)
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index e19ff5edd2..b1db5f6f9f 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -879,7 +879,7 @@ module ActiveRecord
     end
 
     def enlist_fixture_connections
-      ActiveRecord::Base.connection_handler.connection_pools.values.map(&:connection)
+      ActiveRecord::Base.connection_handler.connection_pools.map(&:connection)
     end
 
     private
-- 
cgit v1.2.3