From 5fde4d47938661b77d8b58bec63d64b66c33ced9 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sat, 7 Jul 2012 11:28:59 -0300 Subject: Refactor locked? method in query cache Introduced in 75b340d1a4bcf2f1233fb65a15ff6b8059e2230e --- .../lib/active_record/connection_adapters/abstract/query_cache.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb') diff --git a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb index a6e16da730..be6fda95b4 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb @@ -65,6 +65,7 @@ module ActiveRecord end private + def cache_sql(sql, binds) result = if @query_cache[sql].key?(binds) @@ -85,11 +86,7 @@ module ActiveRecord end def locked?(arel) - if arel.respond_to?(:locked) - arel.locked - else - false - end + arel.respond_to?(:locked) && arel.locked end end end -- cgit v1.2.3