Fix bugs with changed attributes tracking when transaction gets rollback

1 files changed, 56 insertions, 0 deletions

diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index 89dab16975..4edb200b1d 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -268,6 +268,62 @@ class TransactionTest < ActiveRecord::TestCase
     end
   end
 
+  def test_dirty_state_rollback
+    assert !@first.approved?
+    Topic.transaction do
+      @first.approved = true
+      @first.save!
+      raise ActiveRecord::Rollback
+    end
+    assert @first.approved
+    assert @first.changes["approved"]
+    @first.save!
+    assert @first.reload.approved
+  end
+
+  def test_dirty_state_rollback2
+    assert !@first.approved?
+    @first.approved = true
+    Topic.transaction do
+      @first.save!
+      raise ActiveRecord::Rollback
+    end
+    assert @first.changes["approved"]
+    assert @first.approved
+    @first.save!
+    assert @first.reload.approved
+  end
+
+  def test_dirty_state_rollback3
+    assert !@first.approved?
+    @first.approved = true
+    @first.save!
+    Topic.transaction do
+      @first.approved = false
+      @first.save!
+      raise ActiveRecord::Rollback
+    end
+    assert !@first.approved
+    assert @first.changes["approved"]
+    @first.save!
+    assert !@first.reload.approved
+  end
+
+  def test_dirty_state_rollback4
+    assert !@first.approved?
+    Topic.transaction do
+      @first.approved = true
+      @first.save!
+      @first.approved = false
+      @first.save!
+      raise ActiveRecord::Rollback
+    end
+    assert !@first.approved
+    assert !@first.changes["approved"]
+    @first.save!
+    assert !@first.reload.approved
+  end
+
   def test_force_savepoint_in_nested_transaction
     Topic.transaction do
       @first.approved = true