bulk_dependency_eraser 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60f1df6c3a60ce0e7d3048cdcb263986148ca7989464f90859455afea67eae78
-  data.tar.gz: 5069d8a435cc8ac13a2b4e873318c1c0a4ada041a5ed292b8df58212af3bc887
+  metadata.gz: 7e0b2a7c10501166d33e7076cf19b7c241ffd9de2704d94aca6f7c9fecc6e2d4
+  data.tar.gz: 6788ed915a4a6b4f7d7dbe2c8387244b0ff5e758098fe48f47b47127e64d9fb5
 SHA512:
-  metadata.gz: 590c7dc30ca2d04140332d0c97128dcddbfb9a95e07d8a413006faa32011d3343fa5363e1a5a43f3678ae2b96f7ca9e44cdc23775f69a6971d576f000e4254c3
-  data.tar.gz: 6bff0c448928f611a0c8ce7f684df5b636d66bf0570c793ced8204eb759a1e0ad020e3947caa562610a5410f967b8ee4ef2bdc191aa37abd2e5ec47d497d11c6
+  metadata.gz: ab13a12a9e5965890ae2e27cbf0971ba75aec2dbdc463d92c1631ac9cdb6dd98729e22cedb9c05cfb4cd4f897ca774c5204d0c3a61c804f8f7f8961de4e686cb
+  data.tar.gz: 9d0968970dd212e9e07c459134e829c8b1fd17c3c65d2b1e7665f983a68c4655044e3732ce7e2f6d28fb0c0e59606ffde0f343761a4730abb2f6dc74c3ba521d

data/lib/bulk_dependency_eraser/builder.rb

@@ -152,6 +152,9 @@ module BulkDependencyEraser
     attr_reader :ignore_table_name_and_dependencies, :ignore_klass_name_and_dependencies
 
     def pluck_from_query query, column = :id
+      # ordering shouldn't matter in these queries, and would slow it down
+      # - we're ignoring default_scope ordering, but assoc-defined ordering would still take effect
+      query = query.reorder('')
       query_ids = []
       read_from_db do
         # If the query has a limit, then we don't want to clobber with batching.
@@ -613,11 +616,28 @@ module BulkDependencyEraser
         return
       end
 
-      # Not sure how to limit/offset batch this right now.
-      # - it's a rare use-case, let's just leave this as a TODO:
       foreign_ids_by_type = read_from_db do
-        query.pluck(specified_foreign_key, specified_foreign_type).each_with_object({}) do |(id, type), hash|
-          hash.key?(type) ? hash[type] << id : hash[type] = [id]
+        if batching_disabled? || !query.where({}).limit_value.nil?
+          # query without batching
+          query.reorder('').pluck(specified_foreign_key, specified_foreign_type).each_with_object({}) do |(id, type), hash|
+            hash.key?(type) ? hash[type] << id : hash[type] = [id]
+          end
+        else
+          columns_and_ids = {}
+          offset = 0
+          loop do
+            counter = 0
+            query.reorder('').offset(offset).limit(batch_size).pluck(specified_foreign_key, specified_foreign_type).each do |id, type|
+              columns_and_ids.key?(type) ? columns_and_ids[type] << id : columns_and_ids[type] = [id]
+              counter += 1
+            end
+
+            break if counter < batch_size
+
+            # Move to the next batch
+            offset += batch_size
+          end
+          columns_and_ids
         end
       end
 

data/lib/bulk_dependency_eraser/version.rb

@@ -1,3 +1,3 @@
 module BulkDependencyEraser
-  VERSION = "1.3.1".freeze
+  VERSION = "1.3.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bulk_dependency_eraser
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - benjamin.dana.software.dev@gmail.com