diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-11-07 08:50:44 +1030 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-07 08:50:44 +1030 |
| commit | 05eccb116ded8fd1250524cc4314907ff77511cd (patch) | |
| tree | 0326fdc7443dad0e041b93713680421efaa1ed93 /activerecord/lib/active_record | |
| parent | a705cd8d88ca68b2746db32e70aa1b006e3cd402 (diff) | |
| parent | 01c703248396528d9f3398d0f9d0143831e9d0dc (diff) | |
| download | rails-05eccb116ded8fd1250524cc4314907ff77511cd.tar.gz rails-05eccb116ded8fd1250524cc4314907ff77511cd.tar.bz2 rails-05eccb116ded8fd1250524cc4314907ff77511cd.zip | |
Merge pull request #28360 from kbrock/transaction_fix
Handle Timeout.timeout in rails queries
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/transaction.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb index 147e16e9fa..d9ac8db6a8 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb @@ -240,7 +240,7 @@ module ActiveRecord rollback_transaction if transaction else begin - commit_transaction + commit_transaction if transaction rescue Exception rollback_transaction(transaction) unless transaction.state.completed? raise |