bulk_dependency_eraser 1.4.1 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5258d3b15269fb6bd51a5f89f949983a3cf48862cc83f26a8f189bbc11e2ae84
-  data.tar.gz: dbab67950500c1037266232592915a3c27f0b54102619092be465ded4a53024d
+  metadata.gz: a505cd8d1072193bb45a5896b9ec1882793c030552ff4a992f06f48b446deca9
+  data.tar.gz: 0061d59c8ccd8abe86eedf0bd78e7fb57f6ed2b14e03fd0ad2c247c136c1ffef
 SHA512:
-  metadata.gz: 351634d20e814264885ddd4746e2fbaa7a8d27c4ab78fda5d3690e21697de51d1fd51c75d2b749e6f9a4727f79e6fa43d571617364df1e44870a55aeb0e88166
-  data.tar.gz: e8e477e1d5139bd4ac38cb3d4e4371b06688b5dc5e000d8a6a6077cc300ec998916cdd754c00d87ea1efd0b0a179479c60491450467cfc8eefbb6b0bda391690
+  metadata.gz: e6363cea019a2c86478e3ba5c79c6348db9868c64c40a02a326849827e404bae1542bb3c9686f1ad258717a432c52706b3ce2cbde58e820e520604743c7e7b12
+  data.tar.gz: 1af86850bdacf28110bfa80236ee188c8a5995e92214ee6e4e099696870385f3d62c504031501039747ac4c03cc43b95af7cb24aaae22825c6630e7740c143e4

data/lib/bulk_dependency_eraser/base.rb

@@ -5,6 +5,28 @@ module BulkDependencyEraser
     # Default Custom Scope for mapped-by-name classes, no effect.
     DEFAULT_KLASS_MAPPED_SCOPE_WRAPPER = ->(query) { query }
 
+    DEFAULT_DB_READ_WRAPPER  = ->(block) {
+      begin
+        ActiveRecord::Base.connected_to(role: :reading) do
+          block.call
+        end
+      rescue ActiveRecord::ConnectionNotEstablished
+        # No role: :reading setup, use regular connection
+        block.call
+      end
+    }
+    DEFAULT_DB_WRITE_WRAPPER = ->(block) {
+      begin
+        ActiveRecord::Base.connected_to(role: :writing) do
+          block.call
+        end
+      rescue ActiveRecord::ConnectionNotEstablished
+        # No role: :writing setup, use regular connection
+        block.call
+      end
+    }
+    DEFAULT_DB_BLANK_WRAPPER = ->(block) { block.call }
+
     DEFAULT_OPTS = {
       # Applied to all queries. Useful for taking advantage of specific indexes
       # - not indexed by klass name. Proc would handle the logic for that.
@@ -17,10 +39,6 @@ module BulkDependencyEraser
       proc_scopes_per_class_name: {},
     }.freeze
 
-
-    # Default Database wrapper, no effect.
-    DEFAULT_DB_WRAPPER = ->(block) { block.call }
-
     attr_reader :errors
 
     def initialize opts: {}
@@ -37,17 +55,18 @@ module BulkDependencyEraser
 
     protected
 
-    def custom_scope_for_klass_name(klass)
+    def custom_scope_for_query(query)
+      klass = query.klass
       if opts_c.proc_scopes_per_class_name.key?(klass.name)
-        opts_c.proc_scopes_per_class_name[klass.name]
+        opts_c.proc_scopes_per_class_name[klass.name].call(query)
       else
         # See if non-class-mapped proc returns a value
-        non_class_name_mapped_query = opts_c.proc_scopes.call(klass.where({})) # convert klass to query
+        non_class_name_mapped_query = opts_c.proc_scopes.call(query)
         if !non_class_name_mapped_query.nil?
-          return opts_c.proc_scopes
+          return non_class_name_mapped_query
         else
           # No custom wrapper, return non-effect default
-          return self.class::DEFAULT_KLASS_MAPPED_SCOPE_WRAPPER
+          return self.class::DEFAULT_KLASS_MAPPED_SCOPE_WRAPPER.call(query)
         end
       end
     end

data/lib/bulk_dependency_eraser/builder.rb

@@ -7,7 +7,7 @@ module BulkDependencyEraser
       # - We would have to instantiate if we wanted to apply that scope filter.
       instantiate_if_assoc_scope_with_arity: false,
       # wraps around the DB reading
-      db_read_wrapper: self::DEFAULT_DB_WRAPPER,
+      db_read_wrapper: self::DEFAULT_DB_READ_WRAPPER,
       # Will parse these tables and their dependencies, but will remove the tables from the lists after parsing.
       ignore_tables: [],
       # Won't parse any table in this list
@@ -34,12 +34,6 @@ module BulkDependencyEraser
       reading_proc_scopes_per_class_name: {},
     }.freeze
 
-    DEFAULT_DB_WRAPPER = ->(block) do
-      ActiveRecord::Base.connected_to(role: :reading) do
-        block.call
-      end
-    end
-
     DEPENDENCY_NULLIFY = %i[
       nullify
     ].freeze
@@ -163,11 +157,12 @@ module BulkDependencyEraser
     attr_reader :table_names_to_parsed_klass_names
     attr_reader :ignore_table_name_and_dependencies, :ignore_klass_name_and_dependencies
 
-    def custom_scope_for_klass_name(klass)
+    def custom_scope_for_query(query)
+      klass = query.klass
       if opts_c.reading_proc_scopes_per_class_name.key?(klass.name)
-        opts_c.reading_proc_scopes_per_class_name[klass.name]
+        opts_c.reading_proc_scopes_per_class_name[klass.name].call(query)
       else
-        super(klass)
+        super(query)
       end
     end
 
@@ -175,7 +170,7 @@ module BulkDependencyEraser
       # 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 = custom_scope_for_klass_name(query.klass).call(query)
+      query = custom_scope_for_query(query)
 
       query_ids = []
       read_from_db do
@@ -639,7 +634,7 @@ module BulkDependencyEraser
         return
       end
 
-      query = custom_scope_for_klass_name(query.klass).call(query)
+      query = custom_scope_for_query(query)
 
       foreign_ids_by_type = read_from_db do
         if batching_disabled? || !query.where({}).limit_value.nil?

data/lib/bulk_dependency_eraser/deleter.rb

@@ -2,7 +2,7 @@ module BulkDependencyEraser
   class Deleter < Base
     DEFAULT_OPTS = {
       verbose: false,
-      db_delete_wrapper: self::DEFAULT_DB_WRAPPER,
+      db_delete_wrapper: self::DEFAULT_DB_WRITE_WRAPPER,
       # Set to true if you want 'ActiveRecord::InvalidForeignKey' errors raised during deletions
       enable_invalid_foreign_key_detection: false,
       disable_batching: false,
@@ -26,12 +26,6 @@ module BulkDependencyEraser
       deletion_proc_scopes_per_class_name: {},
     }.freeze
 
-    DEFAULT_DB_WRAPPER = ->(block) do
-      ActiveRecord::Base.connected_to(role: :writing) do
-        block.call
-      end
-    end
-
     def initialize class_names_and_ids: {}, opts: {}
       @class_names_and_ids = class_names_and_ids
       super(opts:)
@@ -77,11 +71,12 @@ module BulkDependencyEraser
 
     attr_reader :class_names_and_ids
 
-    def custom_scope_for_klass_name(klass)
+    def custom_scope_for_query(query)
+      klass = query.klass
       if opts_c.deletion_proc_scopes_per_class_name.key?(klass.name)
-        opts_c.deletion_proc_scopes_per_class_name[klass.name]
+        opts_c.deletion_proc_scopes_per_class_name[klass.name].call(query)
       else
-        super(klass)
+        super(query)
       end
     end
 
@@ -96,7 +91,7 @@ module BulkDependencyEraser
     def delete_by_klass_and_ids klass, ids
       puts "Deleting #{klass.name}'s IDs: #{ids}" if opts_c.verbose
       query = klass.unscoped
-      query = custom_scope_for_klass_name(klass).call(query)
+      query = custom_scope_for_query(query)
 
       if batching_disabled?
         puts "Deleting without batching" if opts_c.verbose

data/lib/bulk_dependency_eraser/nullifier.rb

@@ -2,7 +2,7 @@ module BulkDependencyEraser
   class Nullifier < Base
     DEFAULT_OPTS = {
       verbose: false,
-      db_nullify_wrapper: self::DEFAULT_DB_WRAPPER,
+      db_nullify_wrapper: self::DEFAULT_DB_WRITE_WRAPPER,
       # Set to true if you want 'ActiveRecord::InvalidForeignKey' errors raised during nullifications
       # - I can't think of a use-case where a nullification would generate an invalid key error
       # - Not hurting anything to leave it in, but might remove it in the future.
@@ -28,12 +28,6 @@ module BulkDependencyEraser
       nullification_proc_scopes_per_class_name: {},
     }.freeze
 
-    DEFAULT_DB_WRAPPER = ->(block) do
-      ActiveRecord::Base.connected_to(role: :writing) do
-        block.call
-      end
-    end
-
     # @param class_names_columns_and_ids [Hash] - model names with columns to nullify pointing towards the record IDs that require the nullification.
     # - structure:
     #    {
@@ -135,11 +129,12 @@ module BulkDependencyEraser
 
     attr_reader :class_names_columns_and_ids
 
-    def custom_scope_for_klass_name(klass)
+    def custom_scope_for_query(query)
+      klass = query.klass
       if opts_c.nullification_proc_scopes_per_class_name.key?(klass.name)
-        opts_c.nullification_proc_scopes_per_class_name[klass.name]
+        opts_c.nullification_proc_scopes_per_class_name[klass.name].call(query)
       else
-        super(klass)
+        super(query)
       end
     end
 
@@ -153,7 +148,7 @@ module BulkDependencyEraser
 
     def nullify_by_klass_column_and_ids klass, columns, ids
       query = klass.unscoped
-      query = custom_scope_for_klass_name(klass).call(query)
+      query = custom_scope_for_query(query)
 
       nullify_columns = {}
       # supporting nullification of groups of columns simultaneously

data/lib/bulk_dependency_eraser/version.rb

@@ -1,3 +1,3 @@
 module BulkDependencyEraser
-  VERSION = "1.4.1".freeze
+  VERSION = "1.4.3".freeze
 end

metadata

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