diff options
author | Michael Koziarski <michael@koziarski.com> | 2008-08-24 14:34:47 +0200 |
---|---|---|
committer | Michael Koziarski <michael@koziarski.com> | 2008-08-24 14:34:47 +0200 |
commit | 33ed19f428953e2a372345e39ae2b37353a9e9da (patch) | |
tree | e3c3a3c54bb542717890050a3e3de787267ba1d5 /activerecord/lib/active_record/transactions.rb | |
parent | eb2b81c766a6f9bf3c27ae0a494ae82956fb8555 (diff) | |
parent | e02f0dcc24f871d8429229db4219ee1e93636496 (diff) | |
download | rails-33ed19f428953e2a372345e39ae2b37353a9e9da.tar.gz rails-33ed19f428953e2a372345e39ae2b37353a9e9da.tar.bz2 rails-33ed19f428953e2a372345e39ae2b37353a9e9da.zip |
Merge branch 'patches'
Diffstat (limited to 'activerecord/lib/active_record/transactions.rb')
-rw-r--r-- | activerecord/lib/active_record/transactions.rb | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index 0531afbb52..81462a2917 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -91,11 +91,11 @@ module ActiveRecord end def destroy_with_transactions #:nodoc: - transaction { destroy_without_transactions } + with_transaction_returning_status(:destroy_without_transactions) end def save_with_transactions(perform_validation = true) #:nodoc: - rollback_active_record_state! { transaction { save_without_transactions(perform_validation) } } + rollback_active_record_state! { with_transaction_returning_status(:save_without_transactions, perform_validation) } end def save_with_transactions! #:nodoc: @@ -118,5 +118,17 @@ module ActiveRecord end raise end + + # Executes +method+ within a transaction and captures its return value as a + # status flag. If the status is true the transaction is committed, otherwise + # a ROLLBACK is issued. In any case the status flag is returned. + def with_transaction_returning_status(method, *args) + status = nil + transaction do + status = send(method, *args) + raise ActiveRecord::Rollback unless status + end + status + end end end |