aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-06-10 19:13:30 +0900
committerRyuta Kamizono <kamipo@gmail.com>2017-06-20 13:10:07 +0900
commit686e8fb52e00b24bd3a334cd7748df950914bfbf (patch)
treeb7a8ecb4cc048c141912d48c8c7793c8789f746c /activerecord/lib/active_record/relation.rb
parent09cb26bc1e653999827cf3eb955d42a2c932b3f5 (diff)
downloadrails-686e8fb52e00b24bd3a334cd7748df950914bfbf.tar.gz
rails-686e8fb52e00b24bd3a334cd7748df950914bfbf.tar.bz2
rails-686e8fb52e00b24bd3a334cd7748df950914bfbf.zip
`Relation#locked?` should not build arel
Diffstat (limited to 'activerecord/lib/active_record/relation.rb')
-rw-r--r--activerecord/lib/active_record/relation.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 7a8f9abb36..133c1a6318 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -18,7 +18,7 @@ module ActiveRecord
attr_reader :table, :klass, :loaded, :predicate_builder
alias :model :klass
alias :loaded? :loaded
- alias :locked? :locked
+ alias :locked? :lock_value
def initialize(klass, table, predicate_builder, values = {})
@klass = klass