diff options
| author | Jacob Lewallen <jlewallen@gmail.com> | 2010-07-07 10:55:40 +0900 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-07-14 08:02:17 +0200 |
| commit | d10ecfefb8bd4461127f552f14970ad6b3df507f (patch) | |
| tree | e49efae5db87c4a06bf113ec03c2fa37c88d7b95 | |
| parent | 16bae77c568e3e2607ebcfb16a24b9cf6f53df8f (diff) | |
| download | rails-d10ecfefb8bd4461127f552f14970ad6b3df507f.tar.gz rails-d10ecfefb8bd4461127f552f14970ad6b3df507f.tar.bz2 rails-d10ecfefb8bd4461127f552f14970ad6b3df507f.zip | |
Set destroyed=true in opt locking's destroy [#5058 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
| -rw-r--r-- | activerecord/lib/active_record/locking/optimistic.rb | 1 | ||||
| -rw-r--r-- | activerecord/test/cases/locking_test.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb index ceb0902fde..b6f87a57b8 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -124,6 +124,7 @@ module ActiveRecord end end + @destroyed = true freeze end diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb index 66874cdad1..e7126964cd 100644 --- a/activerecord/test/cases/locking_test.rb +++ b/activerecord/test/cases/locking_test.rb @@ -53,7 +53,8 @@ class OptimisticLockingTest < ActiveRecord::TestCase 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 |