aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/locking_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-05-25 21:31:44 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-05-25 21:31:44 +0000
commitc4a31560bd686cbd16b4af20e764a9a0660cd170 (patch)
tree348ad796c4b80d0a227640bf135141c417f4dfbf /activerecord/test/locking_test.rb
parent38deb0ed83c54444e091d39382dcfe58e1c0bd05 (diff)
downloadrails-c4a31560bd686cbd16b4af20e764a9a0660cd170.tar.gz
rails-c4a31560bd686cbd16b4af20e764a9a0660cd170.tar.bz2
rails-c4a31560bd686cbd16b4af20e764a9a0660cd170.zip
Optimistic locking: revert the lock version when an update fails. Closes #7840. Also return the number of affected rows instead of true.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6843 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/locking_test.rb')
-rw-r--r--activerecord/test/locking_test.rb14
1 files changed, 14 insertions, 0 deletions
diff --git a/activerecord/test/locking_test.rb b/activerecord/test/locking_test.rb
index f62f1ac61c..3194727822 100644
--- a/activerecord/test/locking_test.rb
+++ b/activerecord/test/locking_test.rb
@@ -30,6 +30,20 @@ class OptimisticLockingTest < Test::Unit::TestCase
assert_raises(ActiveRecord::StaleObjectError) { p2.save! }
end
+
+ def test_lock_repeating
+ p1 = Person.find(1)
+ p2 = Person.find(1)
+ assert_equal 0, p1.lock_version
+ assert_equal 0, p2.lock_version
+
+ p1.save!
+ assert_equal 1, p1.lock_version
+ assert_equal 0, p2.lock_version
+
+ assert_raises(ActiveRecord::StaleObjectError) { p2.save! }
+ assert_raises(ActiveRecord::StaleObjectError) { p2.save! }
+ end
def test_lock_new
p1 = Person.new(:first_name => 'anika')