This method is useless without a block, so remove test

rails · Aug 20, 2012 · 075b914 · 075b914
1 parent a4697b0
commit 075b914
Showing 1 changed file with 9 additions and 11 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
@@ -184,19 +184,17 @@ def transaction(options = {})
         transaction_open = false
 
         begin
-          if block_given?
+          if requires_new || open_transactions == 0
-            if requires_new || open_transactions == 0
+            if open_transactions == 0
-              if open_transactions == 0
+              begin_db_transaction
-                begin_db_transaction
+            elsif requires_new
-              elsif requires_new
+              create_savepoint
-                create_savepoint
-              end
-              increment_open_transactions
-              transaction_open = true
-              @_current_transaction_records.push([])
             end
-            yield
+            increment_open_transactions
+            transaction_open = true
+            @_current_transaction_records.push([])
           end
+          yield
         rescue Exception => database_transaction_rollback
           if transaction_open && !outside_transaction?
             transaction_open = false