aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/predicate_builder
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-02-04 09:43:21 +1030
committerMatthew Draper <matthew@trebex.net>2016-02-04 09:43:21 +1030
commiteeaf6ee2843775a00579e5996d4081092c567519 (patch)
tree89b632e8b2ab42be322a73d5f08c0e66ed9bb2ca /activerecord/lib/active_record/relation/predicate_builder
parent13b918d1e9ebe2c609b5479550a35f3665c2acd2 (diff)
parent5952861948a0918b1955202c1ea19589634537dc (diff)
downloadrails-eeaf6ee2843775a00579e5996d4081092c567519.tar.gz
rails-eeaf6ee2843775a00579e5996d4081092c567519.tar.bz2
rails-eeaf6ee2843775a00579e5996d4081092c567519.zip
Merge pull request #23457 from matthewd/arel-attribute
Defer Arel attribute lookup to the model class
Diffstat (limited to 'activerecord/lib/active_record/relation/predicate_builder')
-rw-r--r--activerecord/lib/active_record/relation/predicate_builder/relation_handler.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/predicate_builder/relation_handler.rb b/activerecord/lib/active_record/relation/predicate_builder/relation_handler.rb
index 063150958a..8a910a82fe 100644
--- a/activerecord/lib/active_record/relation/predicate_builder/relation_handler.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder/relation_handler.rb
@@ -3,7 +3,7 @@ module ActiveRecord
class RelationHandler # :nodoc:
def call(attribute, value)
if value.select_values.empty?
- value = value.select(value.klass.arel_table[value.klass.primary_key])
+ value = value.select(value.arel_attribute(value.klass.primary_key))
end
attribute.in(value.arel)