aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/merger.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-10 09:52:07 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-10 09:52:07 -0700
commit1f11dbf0b4dacede0da1be1a0675e501d1b0fced (patch)
tree012dcd72d7ab18c92530b203be24b033a73efe19 /activerecord/lib/active_record/relation/merger.rb
parent32a5cad1e46027cf8234cdb8d556f307b86d4c17 (diff)
parentfba18f19948f084023fd8744025f57da00163265 (diff)
downloadrails-1f11dbf0b4dacede0da1be1a0675e501d1b0fced.tar.gz
rails-1f11dbf0b4dacede0da1be1a0675e501d1b0fced.tar.bz2
rails-1f11dbf0b4dacede0da1be1a0675e501d1b0fced.zip
Merge pull request #10558 from Empact/cleanup-finder-methods
Cleanup finder methods
Diffstat (limited to 'activerecord/lib/active_record/relation/merger.rb')
-rw-r--r--activerecord/lib/active_record/relation/merger.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb
index bda7a76330..eea43aff0e 100644
--- a/activerecord/lib/active_record/relation/merger.rb
+++ b/activerecord/lib/active_record/relation/merger.rb
@@ -94,9 +94,7 @@ module ActiveRecord
[])
relation.joins! rest
- join_dependency.join_associations.each do |association|
- @relation = association.join_relation(relation)
- end
+ @relation = join_dependency.join_relation(relation)
end
end