bulk_dependency_eraser 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60f1df6c3a60ce0e7d3048cdcb263986148ca7989464f90859455afea67eae78
-  data.tar.gz: 5069d8a435cc8ac13a2b4e873318c1c0a4ada041a5ed292b8df58212af3bc887
+  metadata.gz: bb8d638145b6ff810e2cb3deb79c11a134b9df5e6abdc25755a166d92158c583
+  data.tar.gz: 0f7525a93ddb69db0b0fdb1243973c2a1db1db1d33051fa3fe49e1aaefdb538d
 SHA512:
-  metadata.gz: 590c7dc30ca2d04140332d0c97128dcddbfb9a95e07d8a413006faa32011d3343fa5363e1a5a43f3678ae2b96f7ca9e44cdc23775f69a6971d576f000e4254c3
-  data.tar.gz: 6bff0c448928f611a0c8ce7f684df5b636d66bf0570c793ced8204eb759a1e0ad020e3947caa562610a5410f967b8ee4ef2bdc191aa37abd2e5ec47d497d11c6
+  metadata.gz: 8841e5385fdd92b2d1c14315d849df28a4d8af00a7d8f151a4e04767fd27a9b1cd1653d269912a23385520cb7eb18f8e4b483ab74c7f9a0a5249048fbb81f20b
+  data.tar.gz: c0701a14385970abc0ac5ec0025215a11c5818d391d2bcbef89c36e47c8f7a7919a6dbded77521efdb60108bdb88266ef21268e743265399d58c9a7c4044f648

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.
@@ -424,11 +427,8 @@ module BulkDependencyEraser
         assoc_query = assoc_query.where(specified_foreign_key.to_sym => query_ids)
       end
 
-      # Works in theory for ONE record's has_one, but we're dealing with potentially many
-      # # Apply limit if has_one assocation (subset of has_many)
-      # if opts[:limit]
-      #   assoc_query = assoc_query.limit(opts[:limit])
-      # end
+      # remove any ordering or limits imposed on the association queries from the association definitions
+      assoc_query = assoc_query.reorder('').unscope(:limit)
 
       if type == :delete
         # Recursively call 'deletion_query_parser' on association query, to delete any if the assoc's dependencies
@@ -551,6 +551,9 @@ module BulkDependencyEraser
         specified_primary_key.to_sym => foreign_keys
       )
 
+      # remove any ordering or limits imposed on the association queries from the association definitions
+      assoc_query = assoc_query.reorder('').unscope(:limit)
+
       if type == :delete
         # Recursively call 'deletion_query_parser' on association query, to delete any if the assoc's dependencies
         deletion_query_parser(assoc_query, parent_class)
@@ -569,6 +572,7 @@ module BulkDependencyEraser
     # This method will replicate association_parser, but instantiate and iterate in batches
     def association_parser_belongs_to_instantiation(parent_class, query, query_ids, association_name, type)
       # pending
+      raise "Invalid State! Not ready to instantiate!"
     end
 
     # In this case, it's like a `belongs_to :polymorphicable, polymorphic: true, dependent: :destroy` use-case
@@ -613,11 +617,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.3".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.3
 platform: ruby
 authors:
 - benjamin.dana.software.dev@gmail.com