Added database connection as a yield parameter to ActiveRecord::Base.transaction so you can manually rollback [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6196 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 6 insertions, 1 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 7d7c22c74b..1b75ab53fe 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
@@ -56,7 +56,7 @@ module ActiveRecord
               begin_db_transaction 
               transaction_open = true
             end
-            yield
+            yield self
           end
         rescue Exception => database_transaction_rollback
           if transaction_open
@@ -79,6 +79,11 @@ 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