diff options
| author | Aidan Haran <aidanharan@yahoo.com> | 2017-12-09 13:41:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-09 13:41:02 +0000 |
| commit | 66f34a8ea58c8c98d9cc2651d386c9e5a0789d08 (patch) | |
| tree | d24e9014cf9045abc892ba97ac993e2e26e31c7e /activerecord/lib/active_record/relation/predicate_builder | |
| parent | 3291fa3630c456450f8c6a9b771f77c293d036cd (diff) | |
| parent | 55d4cf2a9c1a6e77ed7aedb866e964039bb4a143 (diff) | |
| download | rails-66f34a8ea58c8c98d9cc2651d386c9e5a0789d08.tar.gz rails-66f34a8ea58c8c98d9cc2651d386c9e5a0789d08.tar.bz2 rails-66f34a8ea58c8c98d9cc2651d386c9e5a0789d08.zip | |
Merge branch 'master' into custom-discarded-job-handling
Diffstat (limited to 'activerecord/lib/active_record/relation/predicate_builder')
| -rw-r--r-- | activerecord/lib/active_record/relation/predicate_builder/relation_handler.rb | 4 |
1 files changed, 4 insertions, 0 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 f51ea4fde0..c8bbfa5051 100644 --- a/activerecord/lib/active_record/relation/predicate_builder/relation_handler.rb +++ b/activerecord/lib/active_record/relation/predicate_builder/relation_handler.rb @@ -4,6 +4,10 @@ module ActiveRecord class PredicateBuilder class RelationHandler # :nodoc: def call(attribute, value) + if value.eager_loading? + value = value.send(:apply_join_dependency) + end + if value.select_values.empty? value = value.select(value.arel_attribute(value.klass.primary_key)) end |