[Bug fix] Clear changes after update (#12)

Author: freddiescadding-pennylane

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activerecord_batch_update (1.0.0)
+    activerecord_batch_update (1.0.1)
       activerecord (>= 7.0, < 8.1)
       activesupport (>= 7.0, < 8.1)
 

activerecord_batch_update.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'activerecord_batch_update'
-  s.version     = '1.0.0'
+  s.version     = '1.0.1'
   s.summary     = 'Update multiple records with different values in a small number of queries'
   s.description = ''
   s.authors     = ['Quentin de Metz']

lib/activerecord_batch_update.rb

@@ -35,6 +35,7 @@ def batch_update(entries, columns:, batch_size: 100, validate: true)
       end
 
       connection.clear_query_cache if connection.query_cache_enabled
+      entries.each { _1.clear_attribute_changes(columns) }
 
       updated_count
     end

spec/activerecord_batch_update_spec.rb

@@ -180,6 +180,31 @@
                                                                          .and(change { cat2.reload.birthday })
       end
 
+      context 'when saving all dirty attributes' do
+        it 'clears all changes after the update' do
+          cat1.name = 'Nala'
+          Cat.batch_update([cat1], columns: :all)
+
+          expect(cat1.changes_to_save).to be_empty
+        end
+      end
+
+      context 'when saving only some of the dirty attributes' do
+        it 'clears changes made during the update' do
+          cat1.assign_attributes(
+            name: 'Nala',
+            birthday: Date.new(2015, 1, 1)
+          )
+          Cat.batch_update([cat1], columns: :name)
+
+          expect(cat1.changes_to_save).to eq(
+            {
+              'birthday' => [Date.new(2010, 1, 1), Date.new(2015, 1, 1)]
+            }
+          )
+        end
+      end
+
       context 'when some fields are encrypted' do
         let!(:cat1) { Cat.create!(name: 'Felix', birthday: Date.new(2010, 1, 1)) }