diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-13 12:59:34 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-13 12:59:34 -0700 |
| commit | 596ecf753eb87ee4f11fc87682b321c64b09d733 (patch) | |
| tree | 215d1442dfc3e3156d1c6a50f412c669b543510d /activerecord/lib/active_record/base.rb | |
| parent | a782fea3592ed0e28f5f5d3815451198e8f40432 (diff) | |
| parent | 21d9c0fc7f79f486fb2c67b3593e9496a1c57663 (diff) | |
| download | rails-596ecf753eb87ee4f11fc87682b321c64b09d733.tar.gz rails-596ecf753eb87ee4f11fc87682b321c64b09d733.tar.bz2 rails-596ecf753eb87ee4f11fc87682b321c64b09d733.zip | |
Merge pull request #5417 from kennyj/fix_5399-32
[3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects.
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
| -rw-r--r-- | activerecord/lib/active_record/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 425cd8cbab..9746efc7d1 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -442,7 +442,7 @@ module ActiveRecord #:nodoc: if self == ActiveRecord::Base ActiveRecord::Base else - connection_handler.connection_pools[name] ? self : superclass.arel_engine + connection_handler.retrieve_connection_pool(self) ? self : superclass.arel_engine end end end |