Merge pull request #266 from ifad/bugfix/177-fix-batches

Fix `find_each` and in batches
ifad · Feb 3, 2024 · 5f05360 · 5f05360
2 parents 02af493 + 3bf9659
commit 5f05360
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
diff --git a/lib/chrono_model.rb b/lib/chrono_model.rb
@@ -56,7 +56,7 @@ def self.history_models
 
   ActiveRecord::Associations::Preloader::ThroughAssociation.prepend ChronoModel::Patches::Preloader::ThroughAssociation
 
-  ActiveRecord::Batches::BatchEnumerator.prepend ChronoModel::Patches::Batches::BatchEnumerator
+  ActiveRecord::Batches.prepend ChronoModel::Patches::Batches
 end
 
 ActiveSupport.on_load :after_initialize do

diff --git a/lib/chrono_model/patches/batches.rb b/lib/chrono_model/patches/batches.rb
@@ -3,14 +3,10 @@
 module ChronoModel
   module Patches
     module Batches
-      module BatchEnumerator
-        def each(&block)
-          if @relation.try(:history?)
-            @relation.with_hid_pkey { super }
-          else
-            super
-          end
-        end
+      def in_batches(**)
+        return super unless try(:history?)
+
+        with_hid_pkey { super }
       end
     end
   end

diff --git a/lib/chrono_model/version.rb b/lib/chrono_model/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ChronoModel
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end
diff --git a/spec/chrono_model/time_machine/batches_spec.rb b/spec/chrono_model/time_machine/batches_spec.rb
@@ -6,6 +6,10 @@
 RSpec.describe ChronoModel::TimeMachine do
   include ChronoTest::TimeMachine::Helpers
 
+  describe '.find_each' do
+    it { expect(Foo.history.find_each(batch_size: 2).count).to eq Foo.history.count }
+  end
+
   describe '.in_batches' do
     let(:foo_in_batches_of_two) do
       [