1 files changed, 8 insertions, 8 deletions
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 84e18684d8..cee3c9999f 100644
--- a/activerecord/lib/active_record/associations/join_dependency/join_association.rb
+++ b/activerecord/lib/active_record/associations/join_dependency/join_association.rb
@@ -25,7 +25,8 @@ module ActiveRecord
           joins         = []
           tables        = tables.reverse
 
-          scope_chain_iter = scope_chain.reverse_each
+          scope_chain_index = 0
+          scope_chain = scope_chain.reverse
 
           # The chain starts with the target table, but we want to end with it here (makes
           # more sense in this context), so we reverse
@@ -44,19 +45,14 @@ module ActiveRecord
 
             constraint = build_constraint(klass, table, key, foreign_table, foreign_key)
 
-            scope_chain_items = scope_chain_iter.next.map do |item|
+            scope_chain_items = scope_chain[scope_chain_index].map do |item|
               if item.is_a?(Relation)
                 item
               else
                 ActiveRecord::Relation.create(klass, table).instance_exec(node, &item)
               end
             end
-
-            if reflection.type
-              scope_chain_items <<
-                ActiveRecord::Relation.create(klass, table)
-                  .where(reflection.type => foreign_klass.base_class.name)
-            end
+            scope_chain_index += 1
 
             scope_chain_items.concat [klass.send(:build_default_scope)].compact
 
@@ -64,6 +60,10 @@ module ActiveRecord
               left.merge right
             end
 
+            if reflection.type
+              constraint = constraint.and table[reflection.type].eq foreign_klass.base_class.name
+            end
+
             if rel && !rel.arel.constraints.empty?
               constraint = constraint.and rel.arel.constraints
             end