0
@@ -21,8 +21,8 @@ module ActiveRecord
0
       def replace(obj, dont_save = false)
0
         load_target
0
 
0
-        unless @target.nil?
0
-          if dependent? && !dont_save && @target != obj
0
+        unless @target.nil? || @target == obj
0
+          if dependent? && !dont_save
0
             @target.destroy unless @target.new_record?
0
             @owner.clear_association_cache
0
           else

0
@@ -79,6 +79,16 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
0
     assert_raises(ActiveRecord::RecordNotFound) { Account.find(old_account_id) }
0
   end
0
 
0
+  def test_natural_assignment_to_already_associated_record
0
+    company = companies(:first_firm)
0
+    account = accounts(:signals37)
0
+    assert_equal company.account, account
0
+    company.account = account
0
+    company.reload
0
+    account.reload
0
+    assert_equal company.account, account
0
+  end
0
+
0
   def test_assignment_without_replacement
0
     apple = Firm.create("name" => "Apple")
0
     citibank = Account.create("credit_limit" => 10)