diff options
author | brainopia <brainopia@evilmartians.com> | 2014-12-25 23:33:47 +0300 |
---|---|---|
committer | Sean Griffin <sean@thoughtbot.com> | 2014-12-26 13:11:10 -0700 |
commit | c6fd24643604b5779a76527e6364f21ee5cc3ce0 (patch) | |
tree | b488c83e1952f45f2079d4c6ad35f5ca4761afbb | |
parent | a983e1e89c6f55cd08feb394db33ca0620fadfd1 (diff) | |
download | rails-c6fd24643604b5779a76527e6364f21ee5cc3ce0.tar.gz rails-c6fd24643604b5779a76527e6364f21ee5cc3ce0.tar.bz2 rails-c6fd24643604b5779a76527e6364f21ee5cc3ce0.zip |
Propagate frozen state during transaction changes
-rw-r--r-- | activerecord/lib/active_record/transactions.rb | 12 | ||||
-rw-r--r-- | activerecord/test/cases/transactions_test.rb | 14 |
2 files changed, 19 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index c4a97db582..dc25525033 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -360,14 +360,12 @@ module ActiveRecord # Save the new record state and id of a record so it can be restored later if a transaction fails. def remember_transaction_record_state #:nodoc: @_start_transaction_state[:id] = id - unless @_start_transaction_state.include?(:new_record) - @_start_transaction_state[:new_record] = @new_record - end - unless @_start_transaction_state.include?(:destroyed) - @_start_transaction_state[:destroyed] = @destroyed - end + @_start_transaction_state.reverse_merge!( + new_record: @new_record, + destroyed: @destroyed, + frozen?: frozen? + ) @_start_transaction_state[:level] = (@_start_transaction_state[:level] || 0) + 1 - @_start_transaction_state[:frozen?] = frozen? end # Clear the new record state and id of a record. diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb index cf50bd4ddb..34afbb0a45 100644 --- a/activerecord/test/cases/transactions_test.rb +++ b/activerecord/test/cases/transactions_test.rb @@ -562,6 +562,20 @@ class TransactionTest < ActiveRecord::TestCase assert !@second.destroyed?, 'not destroyed' end + def test_restore_frozen_state_after_double_destroy + topic = Topic.create + reply = topic.replies.create + + Topic.transaction do + topic.destroy # calls #destroy on reply (since dependent: destroy) + reply.destroy + + raise ActiveRecord::Rollback + end + + assert !reply.frozen?, 'not frozen' + end + def test_sqlite_add_column_in_transaction return true unless current_adapter?(:SQLite3Adapter) |