pass in scope chain so reflection is not needed

2 files changed, 3 insertions, 3 deletions

diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb
index ad7c978ff2..5d1e41dabf 100644
--- a/activerecord/lib/active_record/associations/join_dependency.rb
+++ b/activerecord/lib/active_record/associations/join_dependency.rb
@@ -168,7 +168,7 @@ module ActiveRecord
           chain = child.reflection.chain
           foreign_table = node.table
           foreign_klass = node.base_klass
-          child.join_constraints(foreign_table, foreign_klass, child.join_type, child.tables, chain)
+          child.join_constraints(foreign_table, foreign_klass, child.join_type, child.tables, child.reflection.scope_chain, chain)
             .concat make_joins(child)
         }
       end
diff --git a/activerecord/lib/active_record/associations/join_dependency/join_association.rb b/activerecord/lib/active_record/associations/join_dependency/join_association.rb
index 926d03e495..7420e0df72 100644
--- a/activerecord/lib/active_record/associations/join_dependency/join_association.rb
+++ b/activerecord/lib/active_record/associations/join_dependency/join_association.rb
@@ -25,11 +25,11 @@ module ActiveRecord
           super && reflection == other.reflection
         end
 
-        def join_constraints(foreign_table, foreign_klass, join_type, tables, chain)
+        def join_constraints(foreign_table, foreign_klass, join_type, tables, scope_chain, chain)
           joins         = []
           tables        = tables.reverse
 
-          scope_chain_iter = reflection.scope_chain.reverse_each
+          scope_chain_iter = scope_chain.reverse_each
 
           # The chain starts with the target table, but we want to end with it here (makes
           # more sense in this context), so we reverse