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

Extract JoinDependency#join_relation to DRY the repeated application of the #join_associations.

Browse Source
This commit is contained in:
Ben Woosley 2013-05-10 17:41:29 +02:00
parent 35c198ca9b
commit fba18f1994
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,13 @@ def join_base
join_parts.first
end
def join_relation(relation)
join_associations.each do |association|
relation = association.join_relation(relation)
end
relation
end
def columns
join_parts.collect { |join_part|
table = join_part.aliased_table

5
activerecord/lib/active_record/relation/finder_methods.rb
View File

@ -225,10 +225,7 @@ def construct_relation_for_association_find(join_dependency)
def apply_join_dependency(relation, join_dependency)
relation = relation.except(:includes, :eager_load, :preload)
join_dependency.join_associations.each do |association|
relation = association.join_relation(relation)
end
relation = join_dependency.join_relation(relation)
if using_limitable_reflections?(join_dependency.reflections)
relation

4
activerecord/lib/active_record/relation/merger.rb
View File

@ -94,9 +94,7 @@ def merge_joins
[])
relation.joins! rest
join_dependency.join_associations.each do |association|
@relation = association.join_relation(relation)
end
@relation = join_dependency.join_relation(relation)
end
end