diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-03 23:49:41 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-04 11:58:43 -0300 |
| commit | 94c87156fd67047d96a6805f2f7b8db0a59cd37a (patch) | |
| tree | db00caf6212bb074009e887bc29ea552df9f0185 /activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | |
| parent | 634ecdbf1b6401ded0e145b1e7c7f4808ad89398 (diff) | |
| download | rails-94c87156fd67047d96a6805f2f7b8db0a59cd37a.tar.gz rails-94c87156fd67047d96a6805f2f7b8db0a59cd37a.tar.bz2 rails-94c87156fd67047d96a6805f2f7b8db0a59cd37a.zip | |
Return an array of pools from `connection_pools`
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 11 |
1 files changed, 1 insertions, 10 deletions
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 6235745fb2..1371317e3c 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -2,7 +2,6 @@ require 'thread' require 'thread_safe' require 'monitor' require 'set' -require 'active_support/core_ext/string/filters' module ActiveRecord # Raised when a connection could not be obtained within the connection @@ -517,15 +516,7 @@ module ActiveRecord def connection_pool_list owner_to_pool.values.compact end - - def connection_pools - ActiveSupport::Deprecation.warn(<<-MSG.squish) - 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.) - MSG - - Hash[connection_pool_list.map { |pool| [pool.spec, pool] }] - end + alias :connection_pools :connection_pool_list def establish_connection(owner, spec) @class_to_pool.clear |