From 558c5ff251fa790cd0d623468cc0e45d7efa45ed Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 27 Feb 2008 22:41:35 +0000 Subject: Fix preloading nil polymorphic belongs_to. Closes #11218 [matrix9180] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8933 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/association_preload.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/association_preload.rb b/activerecord/lib/active_record/association_preload.rb index 313c51dae0..a89f5f5459 100644 --- a/activerecord/lib/active_record/association_preload.rb +++ b/activerecord/lib/active_record/association_preload.rb @@ -162,12 +162,13 @@ module ActiveRecord # Construct a mapping from klass to a list of ids to load and a mapping of those ids back to their parent_records records.each do |record| - klass = record.send(polymorph_type) - klass_id = record.send(primary_key_name) + if klass = record.send(polymorph_type) + klass_id = record.send(primary_key_name) - id_map = klasses_and_ids[klass] ||= {} - id_list_for_klass_id = (id_map[klass_id] ||= []) - id_list_for_klass_id << record + id_map = klasses_and_ids[klass] ||= {} + id_list_for_klass_id = (id_map[klass_id] ||= []) + id_list_for_klass_id << record + end end klasses_and_ids = klasses_and_ids.to_a else -- cgit v1.2.3