diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-13 10:27:47 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-13 10:27:47 -0700 |
| commit | dbdbe961cd41a5fa69d6e0e92943195e2fb4d279 (patch) | |
| tree | 24d51eb42fd41cae1191cfbb3d6d34e1425dbd55 /activerecord/lib | |
| parent | 21b69b233bda5870274c84ef8178c9ad9a47c390 (diff) | |
| parent | fdb8805cdd0d159763507e206a6ca3355b27f983 (diff) | |
| download | rails-dbdbe961cd41a5fa69d6e0e92943195e2fb4d279.tar.gz rails-dbdbe961cd41a5fa69d6e0e92943195e2fb4d279.tar.bz2 rails-dbdbe961cd41a5fa69d6e0e92943195e2fb4d279.zip | |
Merge pull request #5416 from kennyj/fix_5399
Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/core.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index e75a2a1cb4..46aababfb6 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -130,7 +130,7 @@ module ActiveRecord end def arel_engine - @arel_engine ||= connection_handler.connection_pools[name] ? self : active_record_super.arel_engine + @arel_engine ||= connection_handler.retrieve_connection_pool(self) ? self : active_record_super.arel_engine end private |