0
@@ -195,7 +195,7 @@ module ActiveRecord
0
 
0
       def preload_has_one_association(records, reflection, preload_options={})
0
         return if records.first.send("loaded_#{reflection.name}?")
0
-        id_to_record_map, ids = construct_id_map(records)
0
+        id_to_record_map, ids = construct_id_map(records, reflection.options[:primary_key])
0
         options = reflection.options
0
         records.each {|record| record.send("set_#{reflection.name}_target", nil)}
0
         if options[:through]

0
@@ -803,4 +803,20 @@ class EagerAssociationTest < ActiveRecord::TestCase
0
     end
0
   end
0
   
0
+  def test_preload_has_one_using_primary_key
0
+    expected = Firm.find(:first).account_using_primary_key
0
+    firm = Firm.find :first, :include => :account_using_primary_key
0
+    assert_no_queries do
0
+      assert_equal expected, firm.account_using_primary_key
0
+    end
0
+  end
0
+
0
+  def test_include_has_one_using_primary_key
0
+    expected = Firm.find(1).account_using_primary_key
0
+    firm = Firm.find(:all, :include => :account_using_primary_key, :order => 'accounts.id').detect {|f| f.id == 1}
0
+    assert_no_queries do
0
+      assert_equal expected, firm.account_using_primary_key
0
+    end
0
+  end
0
+  
0
 end