database_consistency 3.0.15 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d104523d7460faf27ac7523f032b1802b140560870685207fecaac76bcf76367
-  data.tar.gz: 955b8cc5a9217e578d4a2a2d36a198eca615b11c0ac7e060382904229950fd5c
+  metadata.gz: c8a45e3403f929db1a3524719b0f955b06ac32c922136f5ee930d2eb2b70bdd0
+  data.tar.gz: cc864d1567c17eb3e546321c2d4a1448e2bfc02aec6b4ae25dc7a4f5e6eb5f50
 SHA512:
-  metadata.gz: 652477c0b3c936abbd3f443fad7de53331339a012d229939e61c204d3e60c03a55c3c5eb741aa5aaf5e4dd8d0ac03865e7a4ed80d58d37f85bf2e885eeaf163e
-  data.tar.gz: 657642ff01a583796083f8030a42cd0411b641ebe1fa624872f7467506815a15199493e4cc5765d300e58d65257f93a9cb8b8239a13302e46bffc87dc699124c
+  metadata.gz: 25ef86b694af8d420c054b6e1a900803d1c577a5091470d274ca54c9880786a620379ccbdcab408c2f697d94878a53e94bd175e395e77d040c6c245105b2a141
+  data.tar.gz: 4cd6ea61d0a4243260b754677d1268d5fb4b207f3d0428c4af2db5d485b6dc8202cd9725aaa96696cd36497e0aaea130ea4a3c8a3fa06675f14b74be678bde84

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

@@ -70,13 +70,17 @@ 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

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

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.15'
+  VERSION = '3.1.0'
 end

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'time'
+
 module DatabaseConsistency
   module Writers
     module Autofix
@@ -7,11 +9,21 @@ module DatabaseConsistency
         module Migration # :nodoc:
           def migration_path(name)
             last = migration_context.migrations.last
-            version = ActiveRecord::Migration.next_migration_number(last&.version.to_i + 1)
+            version = ActiveRecord::Migration.next_migration_number(next_version_number(last&.version.to_i))
 
             "db/migrate/#{version}_#{name.underscore}.rb"
           end
 
+          # Adds one second to a timestamp version, so a batch of migrations keeps valid times.
+          def next_version_number(last_version)
+            return last_version + 1 unless last_version.to_s.match?(/\A\d{14}\z/)
+
+            time = Time.strptime("#{last_version} +0000", '%Y%m%d%H%M%S %z').utc
+            (time + 1).strftime('%Y%m%d%H%M%S').to_i
+          rescue ArgumentError
+            last_version + 1
+          end
+
           def migration_path_pattern(name)
             "db/migrate/*_#{name.underscore}.rb"
           end
@@ -28,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/autofix/inconsistent_types.rb

@@ -8,19 +8,41 @@ module DatabaseConsistency
           {
             table_to_change: report.table_to_change,
             type_to_set: report.type_to_set,
-            fk_name: report.fk_name
+            fk_name: report.fk_name,
+            change_columns: change_columns
           }
         end
 
         private
 
+        # Types such as "character varying" have characters that are not valid in a migration name.
         def migration_name
-          "change_#{report.table_to_change}_#{report.fk_name}_to_#{report.type_to_set}"
+          "change_#{report.table_to_change}_#{fk_names.join('_')}_to_#{types.join('_')}".gsub(/\W+/, '_').chomp('_')
         end
 
         def template_path
           File.join(__dir__, 'templates', 'inconsistent_types.tt')
         end
+
+        # Symbol literals keep names such as "billing.orders" and "character varying" valid Ruby.
+        def change_columns
+          fk_names.zip(types).reject { |_fk_name, type| type.nil? }.map do |fk_name, type|
+            "    change_column #{symbol(report.table_to_change)}, #{symbol(fk_name)}, #{symbol(type)}"
+          end.join("\n")
+        end
+
+        def symbol(name)
+          name.to_sym.inspect
+        end
+
+        # Composite keys are joined with "+" and have one type for each column.
+        def fk_names
+          report.fk_name.split('+')
+        end
+
+        def types
+          Array(report.type_to_set)
+        end
       end
     end
   end

data/lib/database_consistency/writers/autofix/templates/inconsistent_types.tt

@@ -1,5 +1,5 @@
 class %<migration_name>s < ActiveRecord::Migration[%<migration_version>s]
   def change
-    change_column :%<table_to_change>s, :%<fk_name>s, :%<type_to_set>s
+%<change_columns>s
   end
 end

metadata

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