diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-05-19 10:10:18 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-19 10:10:18 +0900 |
| commit | 870766017ab20541a1e3b10bf026d82522028028 (patch) | |
| tree | cca7cff257f4d47ec7a0a6c02ccaec4835dc5687 /activerecord/lib/active_record/transactions.rb | |
| parent | 1efbc634b5707cfca1bec0cf39f90520396a979b (diff) | |
| parent | 5359428a142239578b4d1dfb43dd8c417ab57b5c (diff) | |
| download | rails-870766017ab20541a1e3b10bf026d82522028028.tar.gz rails-870766017ab20541a1e3b10bf026d82522028028.tar.bz2 rails-870766017ab20541a1e3b10bf026d82522028028.zip | |
Merge pull request #32911 from eugeneius/finalize_transaction_record_state
Finalize transaction record state after real transaction
Diffstat (limited to 'activerecord/lib/active_record/transactions.rb')
| -rw-r--r-- | activerecord/lib/active_record/transactions.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index 20603aaf2d..ccb2d57b03 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -472,7 +472,8 @@ module ActiveRecord def update_attributes_from_transaction_state(transaction_state) if transaction_state && transaction_state.finalized? - restore_transaction_record_state if transaction_state.rolledback? + restore_transaction_record_state(transaction_state.fully_rolledback?) if transaction_state.rolledback? + force_clear_transaction_record_state if transaction_state.fully_committed? clear_transaction_record_state if transaction_state.fully_completed? end end |