From c3ca7ac09e960fa1287adc730e8ddc713e844c37 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Fri, 9 Nov 2012 14:36:58 +0000
Subject: Properly deprecate ConnectionHandler#connection_pools

Rather than just changing it and hoping for the best.

Requested by @jeremy:

https://github.com/rails/rails/commit/ba1544d71628abff2777c9c514142d7e9a159111#commitcomment-2106059
---
 .../connection_adapters/abstract/connection_pool.rb  | 20 ++++++++++++++------
 activerecord/lib/active_record/fixtures.rb           |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'activerecord/lib/active_record')

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 1da95f451f..db0db272a6 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -1,7 +1,7 @@
 require 'thread'
 require 'monitor'
 require 'set'
-require 'active_support/core_ext/module/deprecation'
+require 'active_support/deprecation'
 
 module ActiveRecord
   # Raised when a connection could not be obtained within the connection
@@ -494,10 +494,18 @@ module ActiveRecord
         @class_to_pool = Hash.new { |h,k| h[k] = {} }
       end
 
-      def connection_pools
+      def connection_pool_list
         owner_to_pool.values.compact
       end
 
+      def connection_pools
+        ActiveSupport::Deprecation.warn(
+          "In the next release, this will return the same as #connection_pool_list. " \
+          "(An array of pools, rather than a hash mapping specs to pools.)"
+        )
+        Hash[connection_pool_list.map { |pool| [pool.spec, pool] }]
+      end
+
       def establish_connection(owner, spec)
         @class_to_pool.clear
         owner_to_pool[owner] = ConnectionAdapters::ConnectionPool.new(spec)
@@ -506,23 +514,23 @@ module ActiveRecord
       # Returns true if there are any active connections among the connection
       # pools that the ConnectionHandler is managing.
       def active_connections?
-        connection_pools.any?(&:active_connection?)
+        connection_pool_list.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(&:release_connection)
+        connection_pool_list.each(&:release_connection)
       end
 
       # Clears the cache which maps classes.
       def clear_reloadable_connections!
-        connection_pools.each(&:clear_reloadable_connections!)
+        connection_pool_list.each(&:clear_reloadable_connections!)
       end
 
       def clear_all_connections!
-        connection_pools.each(&:disconnect!)
+        connection_pool_list.each(&:disconnect!)
       end
 
       # Locate the connection of the nearest super class. This can be an
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 29a99a5336..79d37147d0 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -883,7 +883,7 @@ module ActiveRecord
     end
 
     def enlist_fixture_connections
-      ActiveRecord::Base.connection_handler.connection_pools.map(&:connection)
+      ActiveRecord::Base.connection_handler.connection_pool_list.map(&:connection)
     end
 
     private
-- 
cgit v1.2.3