Skip if the association was already loaded.

rails · May 24, 2014 · b13d260 · b13d260
1 parent ade105b
commit b13d260
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/activerecord/lib/active_record/associations/preloader.rb b/activerecord/lib/active_record/associations/preloader.rb
@@ -143,6 +143,7 @@ def preloaders_for_one(association, records, scope)
       def grouped_records(association, records)
         h = {}
         records.each do |record|
+          next unless record
           assoc = record.association(association)
           klasses = h[assoc.reflection] ||= {}
           (klasses[assoc.klass] ||= []) << record