bulk_dependency_eraser 4.4.0 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcd62dc450607a490d23f589f457c2e2ad30b6ba4096b775266372d2f3952445
-  data.tar.gz: 8e430d8e74cf2d401b75d335a7fc3da82672aa4fedbc0446024bf94c1f632116
+  metadata.gz: edd475ac4b724fa8a753feae41ca8f49ec39aa35423148f8b47bd8e21c35308e
+  data.tar.gz: 685ed6ea1defca2e3406ada070642962c5cb884b18ce1eb52959f65703ddd5b9
 SHA512:
-  metadata.gz: f9added303e9a0982bd9cc026ef03937e0c095421fe89ba7edbdf24c7af27af61cce2f1e3c84b8f56d79fbf441ab5a4d72362fe9053b536af0286cb917c1abbc
-  data.tar.gz: 794831e885f3659586f5ffd075e93aee67d15e919bc2915023e733460e8739d4e5d7f86079f23feaf1cecb0a4a9ffaa6be5ccf885376203464fa7641952413c7
+  metadata.gz: f87e4146f122cfd686c3475584ee01123f216220c251ee54c978918d2e9ebf8287f1f84cc2cfe1dc04302b17ff506c7c3b1513b2a974a2316b978b9bebbe8bb0
+  data.tar.gz: f1e5d3abf75c17dc750f2a687c8c6fc3a5b150e84559aefa8a89f26abfa1d6e7b7ec787b9fd987784f9ae932004f9ab2a9e25fd2ac3f4f10d2b2ce2ee5e7a27b

data/lib/bulk_dependency_eraser/builder.rb

@@ -327,7 +327,8 @@ module BulkDependencyEraser
         end
       end
 
-      if klass.primary_key != 'id'
+      valid_primary_key = klass.primary_key == 'id' || klass.primary_key.is_a?(Array) && klass.primary_key.include?('id')
+      unless valid_primary_key
         report_error(
           "#{klass.name} - does not use primary_key 'id'. Cannot use this tool to bulk delete."
         )
@@ -468,7 +469,8 @@ module BulkDependencyEraser
 
       assoc_query = assoc_klass.unscoped
 
-      unless assoc_klass.primary_key == 'id'
+      valid_primary_key = assoc_klass.primary_key == 'id' || assoc_klass.primary_key.is_a?(Array) && assoc_klass.primary_key.include?('id')
+      unless valid_primary_key
         report_error("#{parent_class.name}'s association '#{association_name}' - assoc class does not use 'id' as a primary_key")
         return
       end
@@ -589,7 +591,8 @@ module BulkDependencyEraser
 
       assoc_query = assoc_klass.unscoped
 
-      unless assoc_klass.primary_key == 'id'
+      valid_primary_key = assoc_klass.primary_key == 'id' || assoc_klass.primary_key.is_a?(Array) && assoc_klass.primary_key.include?('id')
+      unless valid_primary_key
         report_error("#{parent_class.name}'s association '#{association_name}' - assoc class does not use 'id' as a primary_key")
         return
       end

data/lib/bulk_dependency_eraser/deleter.rb

@@ -146,30 +146,19 @@ module BulkDependencyEraser
       detected_additional_identifier_columns = additional_identifiers&.values&.flat_map(&:keys)&.uniq || []
 
       if opts_c.use_pg_system_column_ctid && opts_c.delete_ctids_by_partions && (detected_additional_identifier_columns & ['ctid', 'tableoid::regclass']).size == 2
-        partioned_tables = additional_identifiers.values.pluck('tableoid::regclass').uniq
+        deletable_partioned_tables_by_ctids = additional_identifiers.values.pluck('tableoid::regclass').uniq
       end
 
       if batching_disabled?
         puts "Deleting without batching" if opts_c.verbose
         # Delete by partioned CTIDs
-        if opts_c.use_pg_system_column_ctid && opts_c.delete_ctids_by_partions && (detected_additional_identifier_columns & ['ctid', 'tableoid::regclass']).size == 2
+        if deletable_partioned_tables_by_ctids
           puts "Deleting via CTID and table partitions" if opts_c.verbose
-          partioned_tables.each do |table_partition|
+          deletable_partioned_tables_by_ctids.each do |table_partition|
             identifiers_by_partition = additional_identifiers.filter { |id, identifiers| identifiers['tableoid::regclass'] == table_partition }
             ctids = identifiers_by_partition.values.pluck('ctid')
-            delete_in_db do
-              sql = <<~SQL
-                DELETE FROM #{table_partition}
-                WHERE ctid IN (#{ctids.map { |c| "'#{c}'" }.join(', ')});
-              SQL
-              # Due to the way we've mocked/aliased the partition table in this gem test, we need to also add the partition name as a where clause.
-              if ENV['TEST_GEM_ENV'] == 'bulk_dependency_eraser'
-                sql.sub!(/;\s*$/, "") # remove terminating semicolon
-                sql << " AND tableoid = '#{table_partition}';"
-              end
-              deleted_count = klass.connection.delete(sql)
-              [deleted_count, sql, identifiers_by_partition.keys, identifiers_by_partition]
-            end
+            ids = identifiers_by_partition.values.pluck('id')
+            deletion_by_partitioned_ctids(query, ids, ctids, table_partition, identifiers_by_partition)
           end
         else
           delete_in_db do
@@ -195,29 +184,15 @@ module BulkDependencyEraser
         end
       else
         puts "Deleting with batching" if opts_c.verbose
-        if opts_c.use_pg_system_column_ctid && opts_c.delete_ctids_by_partions && (detected_additional_identifier_columns & ['ctid', 'tableoid::regclass']).size == 2
+        if deletable_partioned_tables_by_ctids
           puts "Deleting via CTID and table partitions" if opts_c.verbose
-          partioned_tables.each do |table_partition|
+          deletable_partioned_tables_by_ctids.each do |table_partition|
             identifiers_by_partition = additional_identifiers.filter { |id, identifiers| identifiers['tableoid::regclass'] == table_partition }
             ids = identifiers_by_partition.keys
             ids.each_slice(batch_size) do |ids_subset|
               additional_identifiers_subset = identifiers_by_partition.slice(*ids_subset)
               ctids = additional_identifiers_subset.values.pluck('ctid')
-              delete_in_db do
-                sql = <<~SQL
-                  DELETE FROM #{table_partition}
-                  WHERE ctid IN (#{ctids.map { |c| "'#{c}'" }.join(', ')});
-                SQL
-
-                # Due to the way we've mocked/aliased the partition table in this gem test, we need to also add the partition name as a where clause.
-                if ENV['TEST_GEM_ENV'] == 'bulk_dependency_eraser'
-                  sql.sub!(/;\s*$/, "") # remove terminating semicolon
-                  sql << " AND tableoid = '#{table_partition}';"
-                end
-
-                deleted_count = klass.connection.delete(sql)
-                [deleted_count, sql, ids_subset, additional_identifiers_subset]
-              end
+              deletion_by_partitioned_ctids(query, ids_subset, ctids, table_partition, identifiers_by_partition)
             end
           end
         else
@@ -251,6 +226,29 @@ module BulkDependencyEraser
       end
     end
 
+    def deletion_by_partitioned_ctids query, ids, ctids, partition_table_name, additional_identifiers
+      delete_in_db do
+        where_clause_sql = <<~SQL
+          ctid IN (#{ctids.map { |c| "'#{c}'" }.join(', ')})
+        SQL
+
+        deletion_sql = <<~SQL
+          DELETE FROM #{partition_table_name}
+          WHERE #{where_clause_sql};
+        SQL
+
+        # Due to the way we've mocked/aliased the partition table in this gem test, we need to also add the partition name as a where clause.
+        if ENV['TEST_GEM_ENV'] == 'bulk_dependency_eraser'
+          deletion_sql.sub!(/;\s*$/, "") # remove terminating semicolon
+          deletion_sql << " AND tableoid = '#{partition_table_name}';"
+        end
+
+        deleted_count = query.klass.connection.delete(deletion_sql)
+        selector_query = query.where(Arel.sql(where_clause_sql))
+        [deleted_count, selector_query, ids, additional_identifiers]
+      end
+    end
+
     def delete_in_db(&block)
       puts "Deleting from DB..." if opts_c.verbose
       opts_c.db_delete_wrapper.call(block)

data/lib/bulk_dependency_eraser/version.rb

@@ -1,3 +1,3 @@
 module BulkDependencyEraser
-  VERSION = "4.4.0".freeze
+  VERSION = "4.4.2".freeze
 end

metadata

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