diff options
author | Xavier Noria <fxn@hashref.com> | 2008-08-24 02:51:45 +0200 |
---|---|---|
committer | Michael Koziarski <michael@koziarski.com> | 2008-08-24 14:34:24 +0200 |
commit | e02f0dcc24f871d8429229db4219ee1e93636496 (patch) | |
tree | 7aa5fd6ffb83b5218d9022d6c9772c0857c0813c /activerecord/lib/active_record/transactions.rb | |
parent | cf28109158054fbab91de2d6d86efe1b40e68d93 (diff) | |
download | rails-e02f0dcc24f871d8429229db4219ee1e93636496.tar.gz rails-e02f0dcc24f871d8429229db4219ee1e93636496.tar.bz2 rails-e02f0dcc24f871d8429229db4219ee1e93636496.zip |
Rollback the transaction when a before_* callback returns false.
Previously this would have committed the transaction but not carried out save or destroy operation.
[#891 state:committed]
Signed-off-by: Michael Koziarski <michael@koziarski.com>
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 |