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

Merge pull request #16797 from eileencodes/refactor-add_constraints-followup-to-16762

Browse Source 
Followup to PR #16762
This commit is contained in:
Matthew Draper 2014-09-04 21:33:40 +09:30
commit 4c23701d3d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
activerecord/lib/active_record/associations/association_scope.rb
View File

@ -113,7 +113,7 @@ def last_chain_scope(scope, table, reflection, owner, tracker, assoc_klass)
end
end
def next_chain_scope(scope, table, reflection, chain, tracker, assoc_klass, foreign_table, next_reflection)
def next_chain_scope(scope, table, reflection, tracker, assoc_klass, foreign_table, next_reflection)
join_keys = reflection.join_keys(assoc_klass)
key = join_keys.key
foreign_key = join_keys.foreign_key
@ -135,16 +135,16 @@ def add_constraints(scope, owner, assoc_klass, refl, tracker)
tables = construct_tables(chain, assoc_klass, refl, tracker)
a_reflection = chain.last
owner_reflection = chain.last
table = tables.last
scope = last_chain_scope(scope, table, a_reflection, owner, tracker, assoc_klass)
scope = last_chain_scope(scope, table, owner_reflection, owner, tracker, assoc_klass)
chain.each_with_index do |reflection, i|
table, foreign_table = tables.shift, tables.first
unless reflection == chain.last
next_reflection = chain[i + 1]
scope = next_chain_scope(scope, table, reflection, chain, tracker, assoc_klass, foreign_table, next_reflection)
scope = next_chain_scope(scope, table, reflection, tracker, assoc_klass, foreign_table, next_reflection)
end
is_first_chain = i == 0