we will always detect the same node, so just pass the node in

1 files changed, 2 insertions, 7 deletions

diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb
index f4bbdc7092..e42736ee8b 100644
--- a/activerecord/lib/active_record/associations/join_dependency.rb
+++ b/activerecord/lib/active_record/associations/join_dependency.rb
@@ -234,18 +234,13 @@ module ActiveRecord
 
       def construct(parent, nodes, row, rs)
         nodes.sort_by { |k| k.name }.each do |node|
-          association_name = node.name
           assoc            = node.children
-          association = construct_scalar(parent, association_name, row, rs, nodes)
+          association = construct_scalar(parent, row, rs, node)
           construct(association, assoc, row, rs) if association
         end
       end
 
-      def construct_scalar(parent, name, row, rs, nodes)
-        node = nodes.detect { |j| j.name == name }
-
-        raise(ConfigurationError, "No such association") unless node
-
+      def construct_scalar(parent, row, rs, node)
         construct_association(parent, node.join_part, row, rs)
       end