aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
diff options
context:
space:
mode:
authorNick Sieger <nick@nicksieger.com>2008-08-22 14:11:44 -0500
committerNick Sieger <nick@nicksieger.com>2008-08-29 14:12:12 -0500
commitd07a6b1a4a234908959650197f596329ca08b4f0 (patch)
tree19d472f5548805372b370d5964322ea86696fedf /activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
parent212134dce158db0ecb4169c28fd9ef80ea1a55b2 (diff)
downloadrails-d07a6b1a4a234908959650197f596329ca08b4f0.tar.gz
rails-d07a6b1a4a234908959650197f596329ca08b4f0.tar.bz2
rails-d07a6b1a4a234908959650197f596329ca08b4f0.zip
Make clear_active_connections! also return stale connections back to the pool
- also clean up some cruft remaining from per-thread connection cache
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
index 47fc11a620..417a333aab 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
@@ -124,9 +124,8 @@ module ActiveRecord
connection_handler.remove_connection(klass)
end
- delegate :active_connections, :clear_active_connections!,
- :clear_reloadable_connections!, :clear_all_connections!,
- :verify_active_connections!, :to => :connection_handler
+ delegate :clear_active_connections!, :clear_reloadable_connections!,
+ :clear_all_connections!,:verify_active_connections!, :to => :connection_handler
end
end
end