aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_handling.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-01-14 12:41:14 -0800
committerJosé Valim <jose.valim@gmail.com>2012-01-14 12:41:14 -0800
commit3d25fa042f8534bac7d8c195e88fa3a892eeac91 (patch)
treeb26b933453c28989e72fe597cfb65dc9696a73c4 /activerecord/lib/active_record/connection_handling.rb
parentf4b1dcdbcfe525efd0eb3ff047bbddca353d47b1 (diff)
parent11cde2bd7b34eef9e487f5ee5f295e56e29b2b02 (diff)
downloadrails-3d25fa042f8534bac7d8c195e88fa3a892eeac91.tar.gz
rails-3d25fa042f8534bac7d8c195e88fa3a892eeac91.tar.bz2
rails-3d25fa042f8534bac7d8c195e88fa3a892eeac91.zip
Merge pull request #4466 from carlosantoniodasilva/generated-attributes-refactor
Generated attributes refactor
Diffstat (limited to 'activerecord/lib/active_record/connection_handling.rb')
-rw-r--r--activerecord/lib/active_record/connection_handling.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/connection_handling.rb b/activerecord/lib/active_record/connection_handling.rb
index e9cd3d5e57..d7746826a9 100644
--- a/activerecord/lib/active_record/connection_handling.rb
+++ b/activerecord/lib/active_record/connection_handling.rb
@@ -90,11 +90,7 @@ module ActiveRecord
connection_handler.remove_connection(klass)
end
- def clear_active_connections!
- connection_handler.clear_active_connections!
- end
-
- delegate :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