diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-06-06 19:48:40 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-06 19:48:40 +0900 |
| commit | 03eadaec4025490d2751ca96338602e701e0f52b (patch) | |
| tree | 2cc95af76b3d5b6a6e75d668b82772dd7e3bcdc3 /activerecord/lib/active_record/associations/join_dependency.rb | |
| parent | d0d3e964920602aa710507f6717010d852e37c86 (diff) | |
| parent | fd689d9fb119ddababae55da40004815f7c4b32d (diff) | |
| download | rails-03eadaec4025490d2751ca96338602e701e0f52b.tar.gz rails-03eadaec4025490d2751ca96338602e701e0f52b.tar.bz2 rails-03eadaec4025490d2751ca96338602e701e0f52b.zip | |
Merge pull request #33066 from chalofa/alias_child_joins
Child joins should be aliased when merging relations
Diffstat (limited to 'activerecord/lib/active_record/associations/join_dependency.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/join_dependency.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb index f88e383fe0..c1faa021aa 100644 --- a/activerecord/lib/active_record/associations/join_dependency.rb +++ b/activerecord/lib/active_record/associations/join_dependency.rb @@ -88,7 +88,7 @@ module ActiveRecord walk join_root, oj.join_root else oj.join_root.children.flat_map { |child| - make_join_constraints(oj.join_root, child, join_type) + make_join_constraints(oj.join_root, child, join_type, true) } end } |