bulk_dependency_eraser 4.2.2 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8efe5bca3c57d245dc00fcb0d04a57bab5dc9eb19d81e55be43a56e6adb7752c
-  data.tar.gz: b6b2d2bf30e7dd964d5032bd61ed1e57f820bec667dd3435c79567e24d6a0265
+  metadata.gz: 6cc809556aa24a68e132b8b18c5107452d98a7659594c8ae60807d4a41192941
+  data.tar.gz: e21b344baed301a3b8732d9b8b6d517fa38353de1169eb3842f752d1aec31be9
 SHA512:
-  metadata.gz: b7981de1665f8c6c7f7c2054c446a09edaa6add210481e091d2034f086eb9703bd619b23de29d03777bb8445b9fc7902329af8ce262204510e0e7695ebe380be
-  data.tar.gz: 42cfbfdb8ad934d9b4d1a806e9da158e82a2ddb2b38cbee790423c5ff046aa3517370f12bd6e5cad00f6ec7db57fb6ee3082bbcb6faefadc866f6332919a6143
+  metadata.gz: 3715bf4c61448253a260e6b968c68bd4f27350f2fe960787c58c60023cade1a62af66ad611c1bf50d7c9c261c9d5f847d9fe28ebb3f31975a4dbe0122de5e56e
+  data.tar.gz: 38dc0a80a042241fbb5964f8da4c0228e4f978cbaba9ebb328b6bd25d78133519c5573b453120cabbc899f8e8b1a041511579e9c5f946a5b65b49a2350761e92

data/lib/bulk_dependency_eraser/builder.rb

@@ -192,12 +192,16 @@ module BulkDependencyEraser
         # If the query has a limit, then we don't want to clobber with batching.
         if batching_disabled? || !query.where({}).limit_value.nil?
           # query without batching
-          query_results = query.pluck(*columns)
+          # query_results = query.pluck(*columns)
+          query_results = query.pluck(*columns.collect{ |c| "#{query.klass.table_name}.#{c}"})
         elsif opts_c.disable_batch_ordering || opts_c.disable_batch_ordering_for_klasses.include?(current_klass_name)
           # query with orderless batching
           offset = 0
           loop do
-            new_query_results = query.offset(offset).limit(batch_size).pluck(*columns)
+            # This use-case didn't work. Rails converts the query filter to a left_outer_join, and can't then pull the CTID column in some use-cases
+            # new_query_results = query.offset(offset).limit(batch_size).pluck(*columns)
+            # This implementation does work. Prevents rails ORM from converting to a join
+            new_query_results = query.offset(offset).limit(batch_size).pluck(*columns.collect{ |c| "#{query.klass.table_name}.#{c}"})
             query_results += new_query_results
 
             break if new_query_results.size < batch_size
@@ -208,7 +212,8 @@ module BulkDependencyEraser
         else
           # query with ordered batching
           query.in_batches(of: batch_size) do |subset_query|
-            query_results += subset_query.pluck(*columns)
+            # query_results += subset_query.pluck(*columns)
+            query_results += subset_query.pluck(*columns.collect{ |c| "#{query.klass.table_name}.#{c}"})
           end
         end
       end

data/lib/bulk_dependency_eraser/deleter.rb

@@ -54,6 +54,7 @@ module BulkDependencyEraser
       # Applied to deletion queries
       # - 1st priority of scopes
       deletion_proc_scopes_per_class_name: {},
+      use_ctid_over_primary_key: false,
     }.freeze
 
     def initialize class_names_and_ids: {}, additional_identifiers_by_id: {}, opts: {}
@@ -140,7 +141,13 @@ module BulkDependencyEraser
         # Get column-names/keys of any additional identifer columns
         detected_additional_identifier_columns = additional_identifiers&.values&.flat_map(&:keys)&.uniq || []
         delete_in_db do
-          deletion_query = query.where(id: ids)
+          deletion_query = query
+          if opts_c.use_ctid_over_primary_key && detected_additional_identifier_columns.include?('ctid')
+            # Do nothing, query will be deleted via ctid
+          else
+            deletion_query = deletion_query.where(id: ids)
+          end
+
           # Apply any additional query identifiers (i.e. :ctid column)
           detected_additional_identifier_columns.each do |column|
             deletion_query = deletion_query.where(column => additional_identifiers.values.pluck(column))
@@ -160,7 +167,13 @@ module BulkDependencyEraser
           # Get column-names/keys of any additional identifer columns
           detected_additional_identifier_columns = additional_identifiers_subset&.values&.flat_map(&:keys)&.uniq || []
           delete_in_db do
-            deletion_query = query.where(id: ids_subset)
+            deletion_query = query
+            if opts_c.use_ctid_over_primary_key && detected_additional_identifier_columns.include?('ctid')
+              # Do nothing, query will be deleted via ctid
+            else
+              deletion_query = deletion_query.where(id: ids_subset)
+            end
+
             # Apply any additional query identifiers (i.e. :ctid column)
             detected_additional_identifier_columns.each do |column|
               deletion_query = deletion_query.where(column => additional_identifiers_subset.values.pluck(column))

data/lib/bulk_dependency_eraser/version.rb

@@ -1,3 +1,3 @@
 module BulkDependencyEraser
-  VERSION = "4.2.2".freeze
+  VERSION = "4.3.0".freeze
 end

metadata

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