From 78c288a362196a6904e3764c351387671004c8c6 Mon Sep 17 00:00:00 2001 From: Arya Asemanfar Date: Sat, 24 Oct 2009 18:26:41 -0700 Subject: [PATCH] fixed bug regarding double-loading associations when preloading --- .../lib/active_record/association_preload.rb | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/activerecord/lib/active_record/association_preload.rb b/activerecord/lib/active_record/association_preload.rb index e41fda7..55af4ab 100644 --- a/activerecord/lib/active_record/association_preload.rb +++ b/activerecord/lib/active_record/association_preload.rb @@ -225,7 +225,8 @@ module ActiveRecord end def preload_has_many_association(records, reflection, preload_options={}) - return if records.first.send(reflection.name).loaded? + records = records.reject {|record| record.send(reflection.name).loaded? } + return if records.empty? options = reflection.options primary_key_name = reflection.through_reflection_primary_key_name -- 1.6.3.2