@@ -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] activerecord/lib/active_record/association_preload.rb @@ -803,4 +803,20 @@ class EagerAssociationTest < ActiveRecord::TestCase end end + def test_preload_has_one_using_primary_key + expected = Firm.find(:first).account_using_primary_key + firm = Firm.find :first, :include => :account_using_primary_key + assert_no_queries do + assert_equal expected, firm.account_using_primary_key + end + end + + def test_include_has_one_using_primary_key + expected = Firm.find(1).account_using_primary_key + firm = Firm.find(:all, :include => :account_using_primary_key, :order => 'accounts.id').detect {|f| f.id == 1} + assert_no_queries do + assert_equal expected, firm.account_using_primary_key + end + end + end activerecord/test/cases/associations/eager_test.rb 7db1704068b86fb2212388b14b4963526bacfa5d Frederick Cheung frederick.cheung@gmail.com http://github.com/rails/rails/commit/f9cab0e503a4721c9d0369f89bb85c6e658f778c f9cab0e503a4721c9d0369f89bb85c6e658f778c 2008-12-26T15:26:37-08:00 2008-12-26T15:26:37-08:00 Fix :include of has_one with :primary_key option 8d0c579bd0f75b824779b3a5ba76c3f39af157a6 Frederick Cheung frederick.cheung@gmail.com