From 3eed78df45d9b8570cc821f5f44c6a1e09ee863a Mon Sep 17 00:00:00 2001 From: Tatsuya Ono Date: Tue, 16 Jun 2009 00:58:03 +0100 Subject: [PATCH] fixed earger-loading problem(#8994) --- .../lib/active_record/association_preload.rb | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/activerecord/lib/active_record/association_preload.rb b/activerecord/lib/active_record/association_preload.rb index e4ab69a..7181da4 100644 --- a/activerecord/lib/active_record/association_preload.rb +++ b/activerecord/lib/active_record/association_preload.rb @@ -122,10 +122,12 @@ module ActiveRecord end def add_preloaded_records_to_collection(parent_records, reflection_name, associated_record) - parent_records.each do |parent_record| - association_proxy = parent_record.send(reflection_name) - association_proxy.loaded - association_proxy.target.push(*[associated_record].flatten) + if associated_record + parent_records.each do |parent_record| + association_proxy = parent_record.send(reflection_name) + association_proxy.loaded + association_proxy.target.push(*[associated_record].flatten) + end end end -- 1.6.1.2