aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorWashington Luiz <huoxito@gmail.com>2013-12-28 23:46:21 -0300
committerWashington Luiz <huoxito@gmail.com>2013-12-31 01:10:38 -0300
commit8e1f26c66c5cd1ceb23baca5fb48440a8c9a06c1 (patch)
tree94a08fa66ac08f9ade34e64763b585008963b5cf /activerecord/lib
parent969a0778cd2fd809a7b4f60c8477bb6d0ac9faf3 (diff)
downloadrails-8e1f26c66c5cd1ceb23baca5fb48440a8c9a06c1.tar.gz
rails-8e1f26c66c5cd1ceb23baca5fb48440a8c9a06c1.tar.bz2
rails-8e1f26c66c5cd1ceb23baca5fb48440a8c9a06c1.zip
Make outer joins on proper parent
Outer joins were being built on the root relation klass rather than the one specified in the join dependency root
Diffstat (limited to 'activerecord/lib')
-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
}