From 27be777888cfefc6667c1d3b4c284cf1d0b67208 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 21 Sep 2010 20:32:00 -0700 Subject: [PATCH] avoid a hash lookup --- activerecord/lib/active_record/associations.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index ff1a3f47b7..1af661c14f 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1962,13 +1962,13 @@ def construct(parent, associations, joins, row) construct(parent, association, joins, row) end when Hash - associations.keys.sort{|a,b|a.to_s<=>b.to_s}.each do |name| + associations.sort_by { |k,_| k.to_s }.each do |name, assoc| join = joins.detect{|j| j.reflection.name.to_s == name.to_s && j.parent_table_name == parent.class.table_name } raise(ConfigurationError, "No such association") if join.nil? association = construct_association(parent, join, row) joins.delete(join) - construct(association, associations[name], joins, row) if association + construct(association, assoc, joins, row) if association end else raise ConfigurationError, associations.inspect -- GitLab