From d0be8a04804fc6e7aa9fa762e4610760891fd5d1 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 8 Oct 2013 15:33:10 -0700 Subject: keys are always symbols --- activerecord/lib/active_record/associations/join_dependency.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'activerecord/lib/active_record/associations') diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb index 65131452ae..dbea122694 100644 --- a/activerecord/lib/active_record/associations/join_dependency.rb +++ b/activerecord/lib/active_record/associations/join_dependency.rb @@ -135,7 +135,7 @@ module ActiveRecord def remove_duplicate_results!(base, records, associations) case associations - when Symbol, String + when Symbol reflection = base.reflections[associations] remove_uniq_by_reflection(reflection, records) when Hash @@ -154,7 +154,9 @@ module ActiveRecord end end - remove_duplicate_results!(reflection.klass, parent_records, associations[name]) unless parent_records.empty? + unless parent_records.empty? + remove_duplicate_results!(reflection.klass, parent_records, associations[name]) + end end end end -- cgit v1.2.3