mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

This method is useless without a block, so remove test

This commit is contained in:
Aaron Patterson 2012-08-20 11:39:19 -07:00
parent a4697b0cc3
commit 075b91454b
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
View File

@ -184,19 +184,17 @@ module ActiveRecord
transaction_open = false
begin
if block_given?
if requires_new || open_transactions == 0
if open_transactions == 0
begin_db_transaction
elsif requires_new
create_savepoint
end
increment_open_transactions
transaction_open = true
@_current_transaction_records.push([])
if requires_new || open_transactions == 0
if open_transactions == 0
begin_db_transaction
elsif requires_new
create_savepoint
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