From 4292f6051d215bcd77e927144c881fc82d1be049 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 8 Oct 2013 19:03:51 -0700 Subject: we do not need to to_s the name all the time --- activerecord/lib/active_record/associations/join_dependency.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb index 15e0053d6d..f4bbdc7092 100644 --- a/activerecord/lib/active_record/associations/join_dependency.rb +++ b/activerecord/lib/active_record/associations/join_dependency.rb @@ -233,7 +233,7 @@ module ActiveRecord end def construct(parent, nodes, row, rs) - nodes.sort_by { |k| k.name.to_s }.each do |node| + 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) @@ -241,10 +241,8 @@ module ActiveRecord end end - def construct_scalar(parent, associations, row, rs, nodes) - name = associations.to_s - - node = nodes.detect { |j| j.name.to_s == name } + def construct_scalar(parent, name, row, rs, nodes) + node = nodes.detect { |j| j.name == name } raise(ConfigurationError, "No such association") unless node -- cgit v1.2.3