diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-11-10 22:22:55 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2017-11-10 22:22:55 +0900 |
| commit | df49896a1e67feea56062639c3cf51e8e0b12a51 (patch) | |
| tree | 719511d0ac433a8a4c2cc1dc9a50eab7dfac9a3e /activerecord/lib/active_record/relation/predicate_builder | |
| parent | a7ef60d5207d3b227d6b7dfe21e453d3548cdefa (diff) | |
| download | rails-df49896a1e67feea56062639c3cf51e8e0b12a51.tar.gz rails-df49896a1e67feea56062639c3cf51e8e0b12a51.tar.bz2 rails-df49896a1e67feea56062639c3cf51e8e0b12a51.zip | |
Ensure `apply_join_dependency` for subqueries in `from` and `where`
Fixes #21577.
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 |