From ebbe4fb0d41feb45628715cd045d89e7bb8ab117 Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Fri, 18 May 2007 01:02:08 +0000 Subject: Replace the transaction {|transaction|..} semantics with a new Exception ActiveRecord::Rollback. Closes #8030 [Koz] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6754 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../connection_adapters/abstract/database_statements.rb | 11 +++-------- 1 file changed, 3 insertions(+), 8 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 1b75ab53fe..bc59f064aa 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb @@ -56,14 +56,14 @@ module ActiveRecord begin_db_transaction transaction_open = true end - yield self - end + yield + end rescue Exception => database_transaction_rollback if transaction_open transaction_open = false rollback_db_transaction end - raise + raise unless database_transaction_rollback.is_a? ActiveRecord::Rollback end ensure commit_db_transaction if transaction_open @@ -79,11 +79,6 @@ module ActiveRecord # done if the transaction block raises an exception or returns false. def rollback_db_transaction() end - # Alias for rollback_db_transaction to be used when yielding the transaction - def rollback! - rollback_db_transaction - end - # Alias for #add_limit_offset!. def add_limit!(sql, options) add_limit_offset!(sql, options) if options -- cgit v1.2.3