aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/join_dependency.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-31 11:48:35 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-31 11:48:35 -0200
commitb953b2fc464a31dfd040de126030ac05e18f6e4c (patch)
tree2935b12ef456f162c27bdc3ad001167b50836bd7 /activerecord/lib/active_record/associations/join_dependency.rb
parentf3a8be3b8be496cd5de14e9c29de3748432d5da0 (diff)
parent8e1f26c66c5cd1ceb23baca5fb48440a8c9a06c1 (diff)
downloadrails-b953b2fc464a31dfd040de126030ac05e18f6e4c.tar.gz
rails-b953b2fc464a31dfd040de126030ac05e18f6e4c.tar.bz2
rails-b953b2fc464a31dfd040de126030ac05e18f6e4c.zip
Merge pull request #13525 from huoxito/make-outer-joins-on-proper-parent
Make outer joins on proper parent
Diffstat (limited to 'activerecord/lib/active_record/associations/join_dependency.rb')
-rw-r--r--activerecord/lib/active_record/associations/join_dependency.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb
index 9506960be3..295dccf34e 100644
--- a/activerecord/lib/active_record/associations/join_dependency.rb
+++ b/activerecord/lib/active_record/associations/join_dependency.rb
@@ -114,7 +114,7 @@ module ActiveRecord
walk join_root, oj.join_root
else
oj.join_root.children.flat_map { |child|
- make_outer_joins join_root, child
+ make_outer_joins oj.join_root, child
}
end
}