database_consistency 3.0.16 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cb0dbacf9e21959370981f0eaa7bee89164144821af616d59f7b5e90f9a0b31
-  data.tar.gz: 7f7e86c94cce08b9b1d858d8099006ac19b58aae8b5e91c4e898ed3289928afd
+  metadata.gz: dd7ba14920b79a253aa4c1b603f4dde0478780f0a0a0b4342eb6a928b153545e
+  data.tar.gz: f655cf5cff2f43b0bef8986fa9617c7891b484f375e34289aaa585b3541f21cb
 SHA512:
-  metadata.gz: 4caf4a0b2bfc7d5887dfb5052b2ec79a979e31589fa357a709f77819ee837a2592f858d8332c1543ce783992e4279aa16f1f53079abaf93a619cd63419d19209
-  data.tar.gz: a3adc09c9b41d1acc40dbbd393430f4db3e07f3aa0d78a5c97854971cd0ad33beaa7b73db012c6360b36adfaf11794df617db89885a2e7981ed547d3a9837563
+  metadata.gz: 3f52bb80a9d738cd62d4385027069b46ea1fd6c8f99fc8aeb161d0d5e75dff8e6004fe61abc0f76497d7dee9e7247ba0cd066018d1920ee23063b928363c25a4
+  data.tar.gz: 796243796d3e50f1aaa5dd750523be44c1db2c8736cf97720921435026b60283be024253e9972a7f2cedc2ed63ba0bdde3e991dcefb1bb88fe91c9a85a20c282

data/lib/database_consistency/checkers/association_checkers/association_checker.rb

@@ -25,7 +25,7 @@ module DatabaseConsistency
       end
 
       def foreign_key # rubocop:disable Metrics/AbcSize
-        model.connection.foreign_keys(model.table_name).find do |foreign_key|
+        model.connection_pool.with_connection { |conn| conn.foreign_keys(model.table_name) }.find do |foreign_key|
           (Helper.extract_columns(association.foreign_key) - Array.wrap(foreign_key.column)).empty? &&
             foreign_key.to_table == association.klass.table_name
         end

data/lib/database_consistency/checkers/association_checkers/foreign_key_cascade_checker.rb

@@ -67,8 +67,8 @@ module DatabaseConsistency
       def foreign_key
         @foreign_key ||=
           association.klass
-                     .connection
-                     .foreign_keys(association.klass.table_name)
+                     .connection_pool
+                     .with_connection { |conn| conn.foreign_keys(association.klass.table_name) }
                      .find { |fk| (Helper.extract_columns(association.foreign_key) - Array.wrap(fk.column)).empty? }
       end
 

data/lib/database_consistency/checkers/association_checkers/foreign_key_checker.rb

@@ -22,7 +22,7 @@ module DatabaseConsistency
         supported? &&
           association.belongs_to? && !association.polymorphic? &&
           same_database? &&
-          model.connection.table_exists?(model.table_name)
+          model.connection_pool.with_connection { |conn| conn.table_exists?(model.table_name) }
       rescue NameError
         false
       end

data/lib/database_consistency/checkers/association_checkers/foreign_key_type_checker.rb

@@ -115,7 +115,7 @@ module DatabaseConsistency
 
       # @return [DatabaseConsistency::Databases::Factory]
       def database_factory
-        @database_factory ||= Databases::Factory.new(association.active_record.connection.adapter_name)
+        @database_factory ||= Databases::Factory.new(association.active_record.connection_pool.with_connection(&:adapter_name))
       end
 
       # @param [ActiveRecord::Base] model
@@ -123,7 +123,8 @@ module DatabaseConsistency
       #
       # @return [ActiveRecord::ConnectionAdapters::Column]
       def column(model, column_name)
-        model.connection.columns(model.table_name).find { |column| column.name == column_name } ||
+        model.connection_pool.with_connection { |conn| conn.columns(model.table_name) }
+             .find { |column| column.name == column_name } ||
           (raise Errors::MissingField, missing_field_error(model.table_name, column_name))
       end
 

data/lib/database_consistency/checkers/association_checkers/missing_index_checker.rb

@@ -16,11 +16,13 @@ module DatabaseConsistency
       #  - association isn't a `HasOne` or `HasMany`
       #  - association has `through` option
       #  - associated class doesn't exist
+      #  - associated class's table doesn't exist
       def preconditions
         %i[
           has_one
           has_many
-        ].include?(association.macro) && association.through_reflection.nil? && association.klass
+        ].include?(association.macro) && association.through_reflection.nil? &&
+          association.klass.table_exists?
       rescue StandardError
         false
       end
@@ -39,7 +41,7 @@ module DatabaseConsistency
       end
 
       def check_unique_has_one
-        if unique_index
+        if unique_index || primary_key_columns.sort == association_keys
           report_template(:ok)
         else
           report_template(:fail, error_slug: :has_one_missing_unique_index)
@@ -47,7 +49,7 @@ module DatabaseConsistency
       end
 
       def check_remaining
-        if index
+        if index || primary_key_columns.first(association_keys.size).sort == association_keys
           report_template(:ok)
         else
           report_template(:fail, error_slug: :association_missing_index)
@@ -70,17 +72,28 @@ module DatabaseConsistency
       end
 
       def unique_index
-        @unique_index ||= association.klass.connection.indexes(association.klass.table_name).find do |index|
+        @unique_index ||= association.klass.connection_pool
+                                     .with_connection { |conn| conn.indexes(association.klass.table_name) }
+                                     .find do |index|
           index_keys(index) == association_keys && index.unique
         end
       end
 
       def index
-        @index ||= association.klass.connection.indexes(association.klass.table_name).find do |index|
+        @index ||= association.klass.connection_pool
+                              .with_connection { |conn| conn.indexes(association.klass.table_name) }
+                              .find do |index|
           index_keys(index, limit: association_keys.size) == association_keys
         end
       end
 
+      # The primary key is an implicit unique index, so it covers the association as well.
+      def primary_key_columns
+        @primary_key_columns ||= Array(
+          association.klass.connection_pool.with_connection { |conn| conn.primary_key(association.klass.table_name) }
+        ).map(&:to_s)
+      end
+
       def association_keys
         @association_keys ||= [association.foreign_key, association.type].compact.map(&:to_s).sort
       end

data/lib/database_consistency/checkers/column_checkers/enum_value_checker.rb

@@ -36,8 +36,8 @@ module DatabaseConsistency
 
       def enum_column_values # rubocop:disable Metrics/AbcSize
         @enum_column_values ||=
-          if model.connection.enum_types.is_a?(Array)
-            _, values = model.connection.enum_types.find { |(enum, _)| enum == column.sql_type }
+          if model.connection_pool.with_connection(&:enum_types).is_a?(Array)
+            _, values = model.connection_pool.with_connection(&:enum_types).find { |(enum, _)| enum == column.sql_type }
             case values
             when Array then values
             else
@@ -45,7 +45,7 @@ module DatabaseConsistency
             end
           else
             # active_record-postgres_enum gem
-            model.connection.enum_types[column.sql_type.to_sym]
+            model.connection_pool.with_connection(&:enum_types)[column.sql_type.to_sym]
           end
       end
 

data/lib/database_consistency/checkers/column_checkers/missing_index_find_by_checker.rb

@@ -65,13 +65,13 @@ module DatabaseConsistency
       end
 
       def indexed?
-        model.connection.indexes(model.table_name).any? do |index|
+        model.connection_pool.with_connection { |conn| conn.indexes(model.table_name) }.any? do |index|
           Helper.extract_index_columns(index.columns).first == column.name.to_s
         end
       end
 
       def primary_key_column?
-        primary_key = model.connection.primary_key(model.table_name)
+        primary_key = model.connection_pool.with_connection { |conn| conn.primary_key(model.table_name) }
 
         column.name.to_s == Array(primary_key).first.to_s
       end

data/lib/database_consistency/checkers/column_checkers/primary_key_type_checker.rb

@@ -70,7 +70,7 @@ module DatabaseConsistency
 
       # @return [Boolean]
       def sqlite?
-        model.connection.adapter_name == SQLITE_ADAPTER_NAME
+        model.connection_pool.with_connection(&:adapter_name) == SQLITE_ADAPTER_NAME
       end
     end
   end

data/lib/database_consistency/checkers/column_checkers/three_state_boolean_checker.rb

@@ -14,7 +14,7 @@ module DatabaseConsistency
 
       # column should be a boolean and table shouldn't be a view
       def preconditions
-        column.type == :boolean && model.connection.table_exists?(model.table_name)
+        column.type == :boolean && model.connection_pool.with_connection { |conn| conn.table_exists?(model.table_name) }
       end
 
       def check

data/lib/database_consistency/checkers/index_checkers/redundant_index_checker.rb

@@ -47,7 +47,7 @@ module DatabaseConsistency
 
       def covered_by_index
         @covered_by_index ||=
-          model.connection.indexes(model.table_name).find do |another_index|
+          model.connection_pool.with_connection { |conn| conn.indexes(model.table_name) }.find do |another_index|
             next if index.name == another_index.name || !Helper.btree_index?(another_index)
 
             clause_equals?(another_index) && include_index_as_prefix?(another_index)

data/lib/database_consistency/checkers/index_checkers/redundant_unique_index_checker.rb

@@ -47,7 +47,7 @@ module DatabaseConsistency
 
       def covered_by_index
         @covered_by_index ||=
-          model.connection.indexes(model.table_name).find do |another_index|
+          model.connection_pool.with_connection { |conn| conn.indexes(model.table_name) }.find do |another_index|
             next if index.name == another_index.name
 
             another_index.unique && clause_equals?(another_index) && contain_index?(another_index)

data/lib/database_consistency/checkers/model_checkers/view_primary_key_checker.rb

@@ -9,7 +9,7 @@ module DatabaseConsistency
       def preconditions
         ActiveRecord::VERSION::MAJOR >= 5 &&
           !model.abstract_class? &&
-          model.connection.view_exists?(model.table_name)
+          model.connection_pool.with_connection { |conn| conn.view_exists?(model.table_name) }
       end
 
       # Table of possible statuses

data/lib/database_consistency/checkers/validator_checkers/missing_unique_index_checker.rb

@@ -47,7 +47,8 @@ module DatabaseConsistency
       end
 
       def unique_index
-        @unique_index ||= model.connection.indexes(model.table_name).find { |index| index_matches?(index) }
+        @unique_index ||= model.connection_pool.with_connection { |conn| conn.indexes(model.table_name) }
+                               .find { |index| index_matches?(index) }
       end
 
       def index_matches?(index)
@@ -57,7 +58,7 @@ module DatabaseConsistency
       end
 
       def primary_key_covers_validation?
-        primary_key = model.connection.primary_key(model.table_name)
+        primary_key = model.connection_pool.with_connection { |conn| conn.primary_key(model.table_name) }
 
         return false if primary_key.blank?
 

data/lib/database_consistency/checkers/validators_fraction_checkers/column_presence_checker.rb

@@ -19,7 +19,9 @@ module DatabaseConsistency
       end
 
       def preconditions
-        (regular_column || association) && model.connection.table_exists?(model.table_name) && validators.any?
+        (regular_column || association) &&
+          model.connection_pool.with_connection { |conn| conn.table_exists?(model.table_name) } &&
+          validators.any?
       end
 
       def report_template(status, column_name:, error_slug: nil)

data/lib/database_consistency/checkers/validators_fraction_checkers/numericality_constraint_checker.rb

@@ -33,8 +33,8 @@ module DatabaseConsistency
       end
 
       def preconditions
-        model.connection.respond_to?(:check_constraints) &&
-          model.connection.table_exists?(model.table_name) &&
+        model.connection_pool.with_connection { |conn| conn.respond_to?(:check_constraints) } &&
+          model.connection_pool.with_connection { |conn| conn.table_exists?(model.table_name) } &&
           column &&
           validators.any?
       end
@@ -54,7 +54,7 @@ module DatabaseConsistency
       end
 
       def check_constraints
-        @check_constraints ||= model.connection.check_constraints(model.table_name)
+        @check_constraints ||= model.connection_pool.with_connection { |conn| conn.check_constraints(model.table_name) }
       rescue StandardError
         []
       end

data/lib/database_consistency/helper.rb

@@ -47,7 +47,7 @@ module DatabaseConsistency
     end
 
     def connected?(klass)
-      klass.connection
+      klass.connection_pool.with_connection { true }
     rescue ActiveRecord::ConnectionNotEstablished
       puts "#{klass} does not have an active connection, skipping"
       false
@@ -66,7 +66,11 @@ module DatabaseConsistency
     def project_klass?(klass)
       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)
+      source_path = Module.const_source_location(klass.to_s).first.to_s
+      bundle_path = Bundler.bundle_path
+      bundle_paths = [bundle_path]
+      bundle_paths << bundle_path.realpath if bundle_path.exist?
+      bundle_paths.none? { |path| source_path.include?(path.to_s) }
     rescue NameError
       false
     end

data/lib/database_consistency/processors/indexes_processor.rb

@@ -9,7 +9,7 @@ module DatabaseConsistency
       def check # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         Helper.parent_models(configuration).flat_map do |model|
           DebugContext.with(model: model.name) do
-            indexes = model.connection.indexes(model.table_name)
+            indexes = model.connection_pool.with_connection { |conn| conn.indexes(model.table_name) }
 
             indexes.flat_map do |index|
               DebugContext.with(index: index.name) do

data/lib/database_consistency/version.rb

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

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

@@ -40,10 +40,10 @@ module DatabaseConsistency
               return ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths)
             end
 
-            if ActiveRecord::Base.connection.respond_to?(:schema_migration)
+            if ActiveRecord::Base.connection_pool.with_connection { |conn| conn.respond_to?(:schema_migration) }
               return ActiveRecord::MigrationContext.new(
                 ActiveRecord::Migrator.migrations_paths,
-                ActiveRecord::Base.connection.schema_migration
+                ActiveRecord::Base.connection_pool.with_connection(&:schema_migration)
               )
             end
 

data/lib/database_consistency/writers/simple/missing_foreign_key_cascade.rb

@@ -7,15 +7,22 @@ module DatabaseConsistency
         private
 
         def template
-          'should have a foreign key with on_delete: :%<cascade_option>s in the database'
+          'should have a foreign key %<cascade_option>s in the database'
         end
 
         def attributes
           {
-            cascade_option: report.cascade_option
+            cascade_option: cascade_option_text
           }
         end
 
+        # nil stands for a foreign key without an on_delete option
+        def cascade_option_text
+          options = report.cascade_option.compact.map { |option| "with on_delete: :#{option}" }
+          options << 'without on_delete' if report.cascade_option.include?(nil)
+          options.join(' or ')
+        end
+
         def unique_attributes
           {
             foreign_table: report.foreign_table,

data/lib/database_consistency/writers/simple_writer.rb

@@ -31,7 +31,7 @@ module DatabaseConsistency
         klass =
           if report.error_slug
             begin
-              "DatabaseConsistency::Writers::Simple::#{report.error_slug.to_s.classify}".constantize
+              "DatabaseConsistency::Writers::Simple::#{report.error_slug.to_s.camelize}".constantize
             rescue NameError
               Simple::DefaultMessage
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_consistency
 version: !ruby/object:Gem::Version
-  version: 3.0.16
+  version: 3.1.1
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-14 00:00:00.000000000 Z
+date: 2026-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord