diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-02-27 22:41:35 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-02-27 22:41:35 +0000 |
| commit | 558c5ff251fa790cd0d623468cc0e45d7efa45ed (patch) | |
| tree | 2578527fb6f7e658d1b3960b07c73256b870f24b /activerecord/lib/active_record/association_preload.rb | |
| parent | 0d70f31057ff5cbdd7f62708a62ce846a1811f9c (diff) | |
| download | rails-558c5ff251fa790cd0d623468cc0e45d7efa45ed.tar.gz rails-558c5ff251fa790cd0d623468cc0e45d7efa45ed.tar.bz2 rails-558c5ff251fa790cd0d623468cc0e45d7efa45ed.zip | |
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
Diffstat (limited to 'activerecord/lib/active_record/association_preload.rb')
| -rw-r--r-- | activerecord/lib/active_record/association_preload.rb | 11 |
1 files changed, 6 insertions, 5 deletions
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 |