diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-04-06 18:58:19 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-04-06 18:58:19 -0300 |
commit | c539cc006179c98d418c6914ce567f657b6f1966 (patch) | |
tree | 16855e039ebab046747325dd5083c37bdba58616 /activerecord/lib/active_record/connection_adapters/abstract | |
parent | a956ec964078ee533644fae2a99e68eda0a7c9d5 (diff) | |
parent | bdc1d329d4eea823d07cf010064bd19c07099ff3 (diff) | |
download | rails-c539cc006179c98d418c6914ce567f657b6f1966.tar.gz rails-c539cc006179c98d418c6914ce567f657b6f1966.tar.bz2 rails-c539cc006179c98d418c6914ce567f657b6f1966.zip |
Merge pull request #19448 from tgxworld/fix_activesupport_callbacks_clash_on_run
Fix AS::Callbacks raising an error when `:run` callback is defined.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 4 |
1 files changed, 2 insertions, 2 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 d99dc9a5db..8c50f3d1a3 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -358,7 +358,7 @@ module ActiveRecord synchronize do owner = conn.owner - conn._run_checkin_callbacks do + conn.run_callbacks :checkin do conn.expire end @@ -449,7 +449,7 @@ module ActiveRecord end def checkout_and_verify(c) - c._run_checkout_callbacks do + c.run_callbacks :checkout do c.verify! end c |