database_consistency 3.0.15 → 3.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d104523d7460faf27ac7523f032b1802b140560870685207fecaac76bcf76367
-  data.tar.gz: 955b8cc5a9217e578d4a2a2d36a198eca615b11c0ac7e060382904229950fd5c
+  metadata.gz: 1cb0dbacf9e21959370981f0eaa7bee89164144821af616d59f7b5e90f9a0b31
+  data.tar.gz: 7f7e86c94cce08b9b1d858d8099006ac19b58aae8b5e91c4e898ed3289928afd
 SHA512:
-  metadata.gz: 652477c0b3c936abbd3f443fad7de53331339a012d229939e61c204d3e60c03a55c3c5eb741aa5aaf5e4dd8d0ac03865e7a4ed80d58d37f85bf2e885eeaf163e
-  data.tar.gz: 657642ff01a583796083f8030a42cd0411b641ebe1fa624872f7467506815a15199493e4cc5765d300e58d65257f93a9cb8b8239a13302e46bffc87dc699124c
+  metadata.gz: 4caf4a0b2bfc7d5887dfb5052b2ec79a979e31589fa357a709f77819ee837a2592f858d8332c1543ce783992e4279aa16f1f53079abaf93a619cd63419d19209
+  data.tar.gz: a3adc09c9b41d1acc40dbbd393430f4db3e07f3aa0d78a5c97854971cd0ad33beaa7b73db012c6360b36adfaf11794df617db89885a2e7981ed547d3a9837563

data/lib/database_consistency/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DatabaseConsistency
-  VERSION = '3.0.15'
+  VERSION = '3.0.16'
 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

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.0.16
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-08 00:00:00.000000000 Z
+date: 2026-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord