diff options
author | Arthur Neves <arthurnn@gmail.com> | 2014-08-08 15:37:38 -0400 |
---|---|---|
committer | Arthur Neves <arthurnn@gmail.com> | 2014-08-15 16:04:02 -0400 |
commit | 0002954512364f2f69d28798f7a79aa8e27d7b6b (patch) | |
tree | 1d50aa0c2a23d3964ae2ee29d03939c855614955 /activerecord/lib/active_record/connection_adapters/abstract/transaction.rb | |
parent | a59b9e2284353dcf8cf6d77b97aaa4255563c807 (diff) | |
download | rails-0002954512364f2f69d28798f7a79aa8e27d7b6b.tar.gz rails-0002954512364f2f69d28798f7a79aa8e27d7b6b.tar.bz2 rails-0002954512364f2f69d28798f7a79aa8e27d7b6b.zip |
Use *_transaction methods in TransactionManager
Use `commit_transaction`/`rollback_transaction` on
`within_new_transaction` method, so they make sure they `pop` the
transaction from the stack before calling the methods `commit`/`rollback`.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/transaction.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/transaction.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb index 4a7f2aaca8..3fce32211d 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb @@ -169,16 +169,14 @@ module ActiveRecord transaction = begin_transaction options yield rescue Exception => error - transaction.rollback if transaction + rollback_transaction if transaction raise ensure begin - transaction.commit unless error + commit_transaction unless error rescue Exception transaction.rollback raise - ensure - @stack.pop if transaction end end |