@@ -470,9 +470,11 @@ module ActiveRecord #:nodoc: def without_locking(&block) current = ActiveRecord::Base.lock_optimistically ActiveRecord::Base.lock_optimistically = false if current - result = block.call - ActiveRecord::Base.lock_optimistically = true if current - result + begin + block.call + ensure + ActiveRecord::Base.lock_optimistically = true if current + end end end end lib/acts_as_versioned.rb @@ -321,8 +321,29 @@ class VersionedTest < AAVTestCase assert landmarks(:washington).changed? assert !landmarks(:washington).altered? end - - -end - + test "without locking temporarily disables optimistic locking" do + enabled1 = false + block_called = false + + ActiveRecord::Base.lock_optimistically = true + LockedPage.without_locking do + enabled1 = ActiveRecord::Base.lock_optimistically + block_called = true + end + enabled2 = ActiveRecord::Base.lock_optimistically + + assert block_called + assert !enabled1 + assert enabled2 + end + + test "without locking reverts optimistic locking settings if block raises exception" do + assert_raises(RuntimeError) do + LockedPage.without_locking do + raise RuntimeError, "oh noes" + end + end + assert ActiveRecord::Base.lock_optimistically + end +end \ No newline at end of file test/versioned_test.rb c82ff9328dc1dbedccd5262c963aad86ce737393 Christian Romney cromney@pointslope.com http://github.com/xmlblog/acts_as_versioned/commit/96f915e943189b510cdd67242a7bb0d62c3ba066 96f915e943189b510cdd67242a7bb0d62c3ba066 2009-06-12T14:56:21-07:00 2009-06-12T14:56:21-07:00 Merged 1bd3d255 from technoweenie's branch e59bdd4cf87994a3ee74232bca839c58f432c63c Christian Romney cromney@pointslope.com