diff options
| author | Frederick Cheung <frederick.cheung@gmail.com> | 2008-12-26 23:26:37 +0000 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-01-01 00:13:10 -0800 |
| commit | 27cfeb7cbcc725c36053833ca8e12cc26357a170 (patch) | |
| tree | 2cf3fe4ee5239b4806c184dbb7840717d4583b50 /activerecord/lib/active_record/association_preload.rb | |
| parent | 3825f173d9f2ff3ecf1563e188a9ad638da9f82d (diff) | |
| download | rails-27cfeb7cbcc725c36053833ca8e12cc26357a170.tar.gz rails-27cfeb7cbcc725c36053833ca8e12cc26357a170.tar.bz2 rails-27cfeb7cbcc725c36053833ca8e12cc26357a170.zip | |
Fix :include of has_one with :primary_key option
Diffstat (limited to 'activerecord/lib/active_record/association_preload.rb')
| -rw-r--r-- | activerecord/lib/active_record/association_preload.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/association_preload.rb b/activerecord/lib/active_record/association_preload.rb index 195d2fb4f8..e4ab69aa1b 100644 --- a/activerecord/lib/active_record/association_preload.rb +++ b/activerecord/lib/active_record/association_preload.rb @@ -195,7 +195,7 @@ module ActiveRecord def preload_has_one_association(records, reflection, preload_options={}) return if records.first.send("loaded_#{reflection.name}?") - id_to_record_map, ids = construct_id_map(records) + id_to_record_map, ids = construct_id_map(records, reflection.options[:primary_key]) options = reflection.options records.each {|record| record.send("set_#{reflection.name}_target", nil)} if options[:through] |