diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2019-04-26 20:03:03 +0900 |
---|---|---|
committer | Ryuta Kamizono <kamipo@gmail.com> | 2019-04-27 21:43:57 +0900 |
commit | 20ede2e2e6e28cf26da4d056cd7638b27d48ed57 (patch) | |
tree | 0c8d93b49aa2d2d015f34279316e5bfa7dcb2985 /activerecord/lib/active_record/relation/query_methods.rb | |
parent | bbc3704bb38d9739d46d94d12a2a854f47b52cbe (diff) | |
download | rails-20ede2e2e6e28cf26da4d056cd7638b27d48ed57.tar.gz rails-20ede2e2e6e28cf26da4d056cd7638b27d48ed57.tar.bz2 rails-20ede2e2e6e28cf26da4d056cd7638b27d48ed57.zip |
Fix merging left_joins to maintain its own `join_type` context
This fixes a regression for #35864.
Usually, stashed joins (mainly eager loading) are performed as LEFT
JOINs.
But the case of merging joins/left_joins of different class, that
(stashed) joins are performed as the same `join_type` as the parent
context for now.
Since #35864, both (joins/left_joins) stashed joins might be contained
in `joins_values`, so each stashed joins should maintain its own
`join_type` context.
Fixes #36103.
Diffstat (limited to 'activerecord/lib/active_record/relation/query_methods.rb')
-rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index c03ca7f1e7..b8fd2fce14 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -1005,9 +1005,9 @@ module ActiveRecord @arel ||= build_arel(aliases) end - def construct_join_dependency(associations) # :nodoc: + def construct_join_dependency(associations, join_type) # :nodoc: ActiveRecord::Associations::JoinDependency.new( - klass, table, associations + klass, table, associations, join_type ) end @@ -1102,7 +1102,7 @@ module ActiveRecord def build_joins(manager, joins, aliases) unless left_outer_joins_values.empty? left_joins = valid_association_list(left_outer_joins_values.flatten) - joins << construct_join_dependency(left_joins) + joins.unshift construct_join_dependency(left_joins, Arel::Nodes::OuterJoin) end buckets = joins.group_by do |join| @@ -1134,9 +1134,9 @@ module ActiveRecord join_list = join_nodes + convert_join_strings_to_ast(string_joins) alias_tracker = alias_tracker(join_list, aliases) - join_dependency = construct_join_dependency(association_joins) + join_dependency = construct_join_dependency(association_joins, join_type) - joins = join_dependency.join_constraints(stashed_joins, join_type, alias_tracker) + joins = join_dependency.join_constraints(stashed_joins, alias_tracker) joins.each { |join| manager.from(join) } manager.join_sources.concat(join_list) |