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

stop doing assingments in an iterator

Browse Source
This commit is contained in:
Aaron Patterson 2013-05-17 15:39:39 -07:00
parent 2eecc0d8dc
commit 18fe96cc16
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,12 +106,16 @@ def join_to(manager)
]
end
scope_chain_items.each do |item|
constraint = scope_chain_items.inject(constraint) do |chain, item|
unless item.is_a?(Relation)
item = ActiveRecord::Relation.new(reflection.klass, table).instance_exec(self, &item)
end
constraint = constraint.and(item.arel.constraints) unless item.arel.constraints.empty?
if item.arel.constraints.empty?
chain
else
chain.and(item.arel.constraints)
end
end
manager.from(join(table, constraint))