diff options
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb | 16 | ||||
| -rw-r--r-- | activerecord/test/transactions_test.rb | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb index febc702922..d99b2c84e4 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb @@ -39,20 +39,24 @@ module ActiveRecord # Wrap a block in a transaction. Returns result of block. def transaction(start_db_transaction = true) - needs_commit = false + transaction_open = false begin if block_given? - begin_db_transaction if start_db_transaction - needs_commit = start_db_transaction + if start_db_transaction + begin_db_transaction + transaction_open = true + end yield end rescue Exception => database_transaction_rollback - rollback_db_transaction if start_db_transaction - needs_commit = false + if transaction_open + transaction_open = false + rollback_db_transaction + end raise end ensure - commit_db_transaction if needs_commit + commit_db_transaction if transaction_open end # Begins the transaction (and turns off auto-committing). diff --git a/activerecord/test/transactions_test.rb b/activerecord/test/transactions_test.rb index 42ed57fad5..806ea0e207 100644 --- a/activerecord/test/transactions_test.rb +++ b/activerecord/test/transactions_test.rb @@ -40,7 +40,7 @@ class TransactionTest < Test::Unit::TestCase alias :real_commit_db_transaction :commit_db_transaction def commit_db_transaction $committed = true - :real_commit_db_transaction + real_commit_db_transaction end end |