=== modified file 'vendor/rails/activerecord/test/cases/autosave_association_test.rb'
--- vendor/rails/activerecord/test/cases/autosave_association_test.rb	2009-04-03 13:23:10 +0000
+++ vendor/rails/activerecord/test/cases/autosave_association_test.rb	2009-06-17 21:31:12 +0000
@@ -30,6 +30,15 @@
     assert base.valid_keys_for_has_and_belongs_to_many_association.include?(:autosave)
   end
 
+  def test_has_one_with_primary_and_foreign_key_set
+    f = Firm.new(:name => 'Firm with account_using_primary_key', :firm_id => 2)
+    a = Account.create(:credit_limit => 20, :firm_id => f.firm_id)
+
+    assoc = f.account_using_primary_key(true)
+    assoc.freeze
+    f.save
+  end
+
   private
 
   def base
@@ -898,4 +907,4 @@
   end
 
   include AutosaveAssociationOnACollectionAssociationTests
-end
\ No newline at end of file
+end