diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-10-25 17:12:19 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-10-25 17:12:19 -0700 |
commit | 89397d09ebb7ca4089f17820d05d5eb223913652 (patch) | |
tree | a3836aedbeba1670571ebe6cbc14b79c921c0068 /activerecord/lib/active_record/connection_adapters | |
parent | 450743cf56125d153b64c3509e75b0e4f86851d1 (diff) | |
download | rails-89397d09ebb7ca4089f17820d05d5eb223913652.tar.gz rails-89397d09ebb7ca4089f17820d05d5eb223913652.tar.bz2 rails-89397d09ebb7ca4089f17820d05d5eb223913652.zip |
Prefix internal method with _
This will avoid naming clash with user defined methods
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-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 da43e5bb10..eba51baba1 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -360,7 +360,7 @@ module ActiveRecord synchronize do owner = conn.owner - conn.run_checkin_callbacks do + conn._run_checkin_callbacks do conn.expire end @@ -449,7 +449,7 @@ module ActiveRecord end def checkout_and_verify(c) - c.run_checkout_callbacks do + c._run_checkout_callbacks do c.verify! end c |