TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

pass the join type to the join_constraints method

Browse Source
This commit is contained in:
Aaron Patterson 2013-10-20 13:11:38 -07:00
parent 2549f6d8ee
commit bae5e02cf3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
activerecord/lib/active_record/associations/join_dependency.rb
View File

@ -165,7 +165,8 @@ def instantiate(result_set, aliases)
def make_joins(node)
node.children.flat_map { |child|
child.join_constraints(node, child.tables, child.reflection.chain)
chain = child.reflection.chain
child.join_constraints(node, child.join_type, child.tables, chain)
.concat make_joins(child)
}
end

2
activerecord/lib/active_record/associations/join_dependency/join_association.rb
View File

@ -25,7 +25,7 @@ def match?(other)
super && reflection == other.reflection
end
def join_constraints(parent, tables, chain)
def join_constraints(parent, join_type, tables, chain)
joins = []
tables = tables.reverse