diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-12-23 00:36:54 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-12-24 11:08:15 +0000 |
| commit | 7293cac8548fb8083f718922d8d3ca9b3a18767f (patch) | |
| tree | 697e322a294d1233c9da2437bb503d28446c29f2 /activerecord/lib/active_record/connection_adapters/abstract | |
| parent | 6af7192af59602e1cbb341b8bf3452afb344eff2 (diff) | |
| download | rails-7293cac8548fb8083f718922d8d3ca9b3a18767f.tar.gz rails-7293cac8548fb8083f718922d8d3ca9b3a18767f.tar.bz2 rails-7293cac8548fb8083f718922d8d3ca9b3a18767f.zip | |
Extract common logic into a method
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 7 |
1 files changed, 1 insertions, 6 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 f69a14f740..5749d45a18 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -371,12 +371,7 @@ connection. For example: ActiveRecord::Base.connection.close pool = @class_to_pool[klass.name] return pool if pool return nil if ActiveRecord::Base == klass - - if klass.superclass && klass.superclass < Model - retrieve_connection_pool klass.superclass - else - retrieve_connection_pool ActiveRecord::Base - end + retrieve_connection_pool klass.active_record_super end end |