pass the outer joins to join_constraints

2 files changed, 3 insertions, 6 deletions

diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb
index 0969fc4ebd..7fd1abc204 100644
--- a/activerecord/lib/active_record/associations/join_dependency.rb
+++ b/activerecord/lib/active_record/associations/join_dependency.rb
@@ -84,7 +84,8 @@ module ActiveRecord
         node.children.each { |child| construct_tables! node, child }
       end
 
-      def join_constraints
+      def join_constraints(outer_joins)
+        outer_joins.each { |oj| merge_outer_joins! oj }
         make_joins join_root
       end
 
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 9c9690215a..328f23d125 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -950,11 +950,7 @@ module ActiveRecord
         join_list
       )
 
-      stashed_association_joins.each do |dep|
-        join_dependency.merge_outer_joins! dep
-      end
-
-      joins = join_dependency.join_constraints
+      joins = join_dependency.join_constraints stashed_association_joins
 
       joins.each { |join| manager.from(join) }