github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-04 03:00:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename ActiveRecord::Base#transaction's :force option to :nest. Improve documentation for nested transactions.

Browse Source
This commit is contained in:
Hongli Lai (Phusion)
2008-10-09 16:24:15 +02:00
parent 885c11b8f9
commit e916aa7ea1
2 changed files with 62 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
activerecord/test/cases/transactions_test.rb
View File

@@ -215,7 +215,7 @@ class TransactionTest < ActiveRecord::TestCase
def test_invalid_keys_for_transaction
assert_raises ArgumentError do
Topic.transaction :forced => true do
Topic.transaction :nested => true do
end
end
end
@@ -228,7 +228,7 @@ class TransactionTest < ActiveRecord::TestCase
@second.save!
begin
Topic.transaction :force => true do
Topic.transaction :nest => true do
@first.happy = false
@first.save!
raise
@@ -268,17 +268,17 @@ class TransactionTest < ActiveRecord::TestCase
@first.save!
begin
Topic.transaction :force => true do
Topic.transaction :nest => true do
@first.content = "Two"
@first.save!
begin
Topic.transaction :force => true do
Topic.transaction :nest => true do
@first.content = "Three"
@first.save!
begin
Topic.transaction :force => true do
Topic.transaction :nest => true do
@first.content = "Four"
@first.save!
raise