diff options
| author | Frederick Cheung <frederick.cheung@gmail.com> | 2008-12-26 22:53:07 +0000 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-01-01 00:13:10 -0800 |
| commit | 3825f173d9f2ff3ecf1563e188a9ad638da9f82d (patch) | |
| tree | 650cba13f2e82fed9208f84ef6006a1d9d5a962c /activerecord/lib/active_record/association_preload.rb | |
| parent | 15702104a502d0d15bea454297260a495b15b62b (diff) | |
| download | rails-3825f173d9f2ff3ecf1563e188a9ad638da9f82d.tar.gz rails-3825f173d9f2ff3ecf1563e188a9ad638da9f82d.tar.bz2 rails-3825f173d9f2ff3ecf1563e188a9ad638da9f82d.zip | |
Fix :include of has_many associations 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 9d0bf3a308..195d2fb4f8 100644 --- a/activerecord/lib/active_record/association_preload.rb +++ b/activerecord/lib/active_record/association_preload.rb @@ -229,7 +229,7 @@ module ActiveRecord options = reflection.options primary_key_name = reflection.through_reflection_primary_key_name - id_to_record_map, ids = construct_id_map(records, primary_key_name) + id_to_record_map, ids = construct_id_map(records, primary_key_name || reflection.options[:primary_key]) records.each {|record| record.send(reflection.name).loaded} if options[:through] |