Set destroyed=true in opt locking's destroy [#5058 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
rails · Jul 14, 2010 · 8298bef · 8298bef
1 parent 046c900
commit 8298bef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb
@@ -128,6 +128,7 @@ def destroy_with_lock #:nodoc:
             end
           end
 
+          @destroyed = true
           freeze
         end
 

diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb
@@ -53,7 +53,8 @@ def test_lock_destroy
     assert_raises(ActiveRecord::StaleObjectError) { p2.destroy }
 
     assert p1.destroy
-    assert_equal true, p1.frozen?
+    assert p1.frozen?
+    assert p1.destroyed?
     assert_raises(ActiveRecord::RecordNotFound) { Person.find(1) }
   end