we always have a reflection and it is on the node

rails · Oct 11, 2013 · 68c0811 · 68c0811
1 parent 5bef5cf
commit 68c0811
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb
@@ -149,7 +149,7 @@ def deep_copy(parent, node)
 
       def remove_duplicate_results!(base, records, associations)
         associations.each do |node|
-          reflection = base.reflect_on_association(node.name)
+          reflection = node.reflection
           remove_uniq_by_reflection(reflection, records)
 
           parent_records = []
@@ -189,7 +189,7 @@ def build_scalar(reflection, parent, join_type)
       end
 
       def remove_uniq_by_reflection(reflection, records)
-        if reflection && reflection.collection?
+        if reflection.collection?
           records.each { |record| record.send(reflection.name).target.uniq! }
         end
       end