diff options
| -rw-r--r-- | activerecord/lib/active_record/transactions.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/transactions_test.rb | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index dc25525033..de701edca0 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -362,8 +362,8 @@ module ActiveRecord @_start_transaction_state[:id] = id @_start_transaction_state.reverse_merge!( new_record: @new_record, - destroyed: @destroyed, - frozen?: frozen? + destroyed: @destroyed, + frozen?: frozen?, ) @_start_transaction_state[:level] = (@_start_transaction_state[:level] || 0) + 1 end diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb index 34afbb0a45..0bbb4bb79e 100644 --- a/activerecord/test/cases/transactions_test.rb +++ b/activerecord/test/cases/transactions_test.rb @@ -573,7 +573,8 @@ class TransactionTest < ActiveRecord::TestCase raise ActiveRecord::Rollback end - assert !reply.frozen?, 'not frozen' + assert_not reply.frozen? + assert_not topic.frozen? end def test_sqlite_add_column_in_transaction |