database_consistency 1.7.24 → 1.7.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b29d0d23f3eda8be6c71719df374c21bf7c69f749bdd5d9e71b658b7194e0a7a
-  data.tar.gz: 4dc387034661a53ce80a65513696da3bb5264b4097d1928268ca2cced6a2b082
+  metadata.gz: f10f22151f5ddbb4c219ebb0efbb2af17e6d73bbd0153ad861cb748c6d202829
+  data.tar.gz: be376924b1db3b17b61eeb8cd0154f855c4b9b1a458cfacaae70c7019c1707ab
 SHA512:
-  metadata.gz: 55f5c65ea75f3384bac11404204522c850d4637c884a6d08cc2b00201e874f74b246410527f6d619e41e35ef078bcca1f7dfce34709621a0a9d4c463b46d727f
-  data.tar.gz: 6bf767f48dfb95cbfce02f9a0fe49718adff8c2afc2e7ae7d74b9496b7991f11bc9f4da10c682cb36dbab310b92c7afc01f9b0b0073c03adaa51000f3f4d216d
+  metadata.gz: 7dde326fd325136cd5972b9d89886cd6f3a39cddda39091ba6ece85f2261f50a9c71d2efdd0ed20c634c974d0604e21fb7b8f28130444d8f237bcdc6ea046a8e
+  data.tar.gz: 69e0304fb9b2aad06cd3efc4a152dd5b51f616f29e3dab9c8252e717393b724de84a8a051ca50700a417954ba96fcead5b2fa121bdd50dfada88c91d0ee96d27

data/lib/database_consistency/configuration.rb

@@ -48,6 +48,10 @@ module DatabaseConsistency
       value
     end
 
+    def model_enabled?(model)
+      database_enabled?(Helper.database_name(model)) && enabled?(model.name.to_s)
+    end
+
     def database_enabled?(name)
       value = configuration.dig('DatabaseConsistencyDatabases', name, 'enabled')
 

data/lib/database_consistency/helper.rb

@@ -29,17 +29,19 @@ module DatabaseConsistency
       end
     end
 
-    def project_models
+    def project_models(configuration)
       ActiveRecord::Base.descendants.select do |klass|
+        next unless configuration.model_enabled?(klass)
+
         project_klass?(klass) && connected?(klass)
       end
     end
 
     # Returns list of models to check
-    def models
-      project_models.select do |klass|
+    def models(configuration)
+      project_models(configuration).select do |klass|
         !klass.abstract_class? &&
-          klass.connection.table_exists?(klass.table_name) &&
+          klass.table_exists? &&
           !klass.name.include?('HABTM_')
       end
     end
@@ -52,8 +54,8 @@ module DatabaseConsistency
     end
 
     # Return list of not inherited models
-    def parent_models
-      models.group_by(&:table_name).each_value.flat_map do |models|
+    def parent_models(configuration)
+      models(configuration).group_by(&:table_name).each_value.flat_map do |models|
         models.reject { |model| models.include?(model.superclass) }
       end
     end
@@ -65,6 +67,8 @@ module DatabaseConsistency
       return true unless Module.respond_to?(:const_source_location) && defined?(Bundler)
 
       !Module.const_source_location(klass.to_s).first.to_s.include?(Bundler.bundle_path.to_s)
+    rescue NameError
+      false
     end
 
     # @return [Boolean]

data/lib/database_consistency/processors/associations_processor.rb

@@ -15,10 +15,8 @@ module DatabaseConsistency
       private
 
       def check # rubocop:disable Metrics/MethodLength
-        Helper.models.flat_map do |model|
+        Helper.models(configuration).flat_map do |model|
           DebugContext.with(model: model.name) do
-            next unless model_enabled?(model)
-
             Helper.first_level_associations(model).flat_map do |association|
               DebugContext.with(association: association.name) do
                 enabled_checkers.flat_map do |checker_class|

data/lib/database_consistency/processors/base_processor.rb

@@ -43,11 +43,6 @@ module DatabaseConsistency
 
       private
 
-      def model_enabled?(model)
-        configuration.database_enabled?(Helper.database_name(model)) &&
-          configuration.enabled?(model.name.to_s)
-      end
-
       def check
         raise NotImplementedError
       end

data/lib/database_consistency/processors/columns_processor.rb

@@ -16,10 +16,8 @@ module DatabaseConsistency
       private
 
       def check # rubocop:disable Metrics/MethodLength
-        Helper.parent_models.flat_map do |model|
+        Helper.parent_models(configuration).flat_map do |model|
           DebugContext.with(model: model.name) do
-            next unless model_enabled?(model)
-
             model.columns.flat_map do |column|
               DebugContext.with(column: column.name) do
                 enabled_checkers.flat_map do |checker_class|

data/lib/database_consistency/processors/enums_processor.rb

@@ -11,10 +11,8 @@ module DatabaseConsistency
       private
 
       def check # rubocop:disable Metrics/MethodLength
-        Helper.models.flat_map do |model|
+        Helper.models(configuration).flat_map do |model|
           DebugContext.with(model: model.name) do
-            next unless model_enabled?(model)
-
             model.defined_enums.keys.flat_map do |enum|
               DebugContext.with(enum: enum) do
                 enabled_checkers.flat_map do |checker_class|

data/lib/database_consistency/processors/indexes_processor.rb

@@ -13,10 +13,8 @@ module DatabaseConsistency
       private
 
       def check # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-        Helper.parent_models.flat_map do |model|
+        Helper.parent_models(configuration).flat_map do |model|
           DebugContext.with(model: model.name) do
-            next unless model_enabled?(model)
-
             indexes = model.connection.indexes(model.table_name)
 
             indexes.flat_map do |index|

data/lib/database_consistency/processors/models_processor.rb

@@ -11,10 +11,8 @@ module DatabaseConsistency
       private
 
       def check
-        Helper.project_models.flat_map do |model|
+        Helper.project_models(configuration).flat_map do |model|
           DebugContext.with(model: model.name) do
-            next unless model_enabled?(model)
-
             enabled_checkers.flat_map do |checker_class|
               DebugContext.with(checker: checker_class) do
                 checker = checker_class.new(model)

data/lib/database_consistency/processors/validators_fractions_processor.rb

@@ -12,10 +12,8 @@ module DatabaseConsistency
 
       # @return [Array<Hash>]
       def check # rubocop:disable Metrics/MethodLength
-        Helper.parent_models.flat_map do |model|
+        Helper.parent_models(configuration).flat_map do |model|
           DebugContext.with(model: model.name) do
-            next unless model_enabled?(model)
-
             model._validators.flat_map do |attribute, validators|
               DebugContext.with(attribute: attribute) do
                 next unless attribute

data/lib/database_consistency/processors/validators_processor.rb

@@ -13,10 +13,8 @@ module DatabaseConsistency
 
       # @return [Array<Hash>]
       def check # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-        Helper.parent_models.flat_map do |model|
+        Helper.parent_models(configuration).flat_map do |model|
           DebugContext.with(model: model.name) do
-            next unless model_enabled?(model)
-
             model.validators.flat_map do |validator|
               next unless validator.respond_to?(:attributes)
 

data/lib/database_consistency/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DatabaseConsistency
-  VERSION = '1.7.24'
+  VERSION = '1.7.26'
 end

data/lib/database_consistency/writers/autofix/helpers/migration.rb

@@ -6,10 +6,9 @@ module DatabaseConsistency
       module Helpers
         module Migration # :nodoc:
           def migration_path(name)
-            migration_paths  = ActiveRecord::Migrator.migrations_paths
-            schema_migration = ActiveRecord::Base.connection.schema_migration
+            migration_context = ActiveRecord::Base.connection.migration_context
 
-            last = ActiveRecord::MigrationContext.new(migration_paths, schema_migration).migrations.last
+            last = migration_context.migrations.last
             version = ActiveRecord::Migration.next_migration_number(last&.version.to_i + 1)
 
             "db/migrate/#{version}_#{name.underscore}.rb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_consistency
 version: !ruby/object:Gem::Version
-  version: 1.7.24
+  version: 1.7.26
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -126,14 +126,14 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.3'
 description: