From c627590fd405bab67fce498cd2b6a781f99f261b Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sat, 23 Jun 2007 00:54:51 +0000 Subject: Rollback if commit raises an exception. Closes #8642. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7088 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../connection_adapters/abstract/database_statements.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'activerecord/lib/active_record/connection_adapters/abstract') 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 3b35a190f9..943aed98d8 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb @@ -57,7 +57,7 @@ module ActiveRecord transaction_open = true end yield - end + end rescue Exception => database_transaction_rollback if transaction_open transaction_open = false @@ -66,7 +66,14 @@ module ActiveRecord raise unless database_transaction_rollback.is_a? ActiveRecord::Rollback end ensure - commit_db_transaction if transaction_open + if transaction_open + begin + commit_db_transaction + rescue Exception => database_transaction_rollback + rollback_db_transaction + raise + end + end end # Begins the transaction (and turns off auto-committing). -- cgit v1.2.3