database_consistency 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0932d2df82273397f2389dada3d7934fa796f9bb9e3b4c07382b629682c7b19d'
-  data.tar.gz: 1d752233498fad2addba69e7b37f5f3a6364493c2bec3883a821901eee2f7061
+  metadata.gz: 7fefd921170f4ae51c6f27495defe6d7cfd65f8d4a8bf4e02085aa437ecd2c7a
+  data.tar.gz: f25b779dbe86f98399e8da406212e2dc421a376af6c8de20dced43d185f62de5
 SHA512:
-  metadata.gz: c0cbca026d510fa349ce5a69c39bbc0b0164ee27bc93e3f75870cdb8b026ca59b5fdbd3466b1eec15b89c921d4f917b7a2f12900d6326e30da33a426aadbcfd3
-  data.tar.gz: b2cd0dc46bc459f3dd2b96e7041b7b7de1ab13e5b2eab347283d8d3d89fc64e82cd94051cae052fe0e52c55b517afc510b4cd1e7fda261b420daf518adc5be49
+  metadata.gz: 3b7e471c020f59578808c600557a55cc5f86bae0ce0e48ad54880d0eb5844c68a498d0b52fe43e2d7c87dcf236922dfb0dc6b880f5305d32fc81cb5299d14c35
+  data.tar.gz: 8ec0910740a62dcc7674a70f292e6156686557f0d9e91fc70e0a98af16b045671d054acbe8140cc5922534a044255a51164586f8a7528f7b2740eca48ecc11fa

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

@@ -26,7 +26,7 @@ module DatabaseConsistency
 
       def foreign_key_exists? # rubocop:disable Metrics/AbcSize
         model.connection.foreign_keys(model.table_name).any? do |foreign_key|
-          (Helper.extract_columns(association.foreign_key.to_s) - Array.wrap(foreign_key.column)).empty? &&
+          (Helper.extract_columns(association.foreign_key) - Array.wrap(foreign_key.column)).empty? &&
             foreign_key.to_table == association.klass.table_name
         end
       end

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

@@ -3,7 +3,7 @@
 module DatabaseConsistency
   module Checkers
     # This class checks if association's foreign key type covers associated model's primary key (same or bigger)
-    class ForeignKeyTypeChecker < AssociationChecker
+    class ForeignKeyTypeChecker < AssociationChecker # rubocop:disable Metrics/ClassLength
       Report = ReportBuilder.define(
         DatabaseConsistency::Report,
         :pk_name,
@@ -36,10 +36,11 @@ module DatabaseConsistency
       # | ------------- | ------ |
       # | covers        | ok     |
       # | doesn't cover | fail   |
-      def check # rubocop:disable Metrics/MethodLength,  Metrics/AbcSize
-        if converted_type(associated_column).cover?(converted_type(primary_column))
-          report_template(:ok)
-        elsif !(converted_type(associated_column).numeric? && converted_type(primary_column).numeric?)
+      def check # rubocop:disable Metrics/MethodLength
+        associated_columns_converted_types = associated_columns.map { |column| converted_type(column) }
+        primary_columns_converted_types = primary_columns.map { |primary_column| converted_type(primary_column) }
+
+        if covers?(associated_columns_converted_types, primary_columns_converted_types)
           report_template(:ok)
         else
           report_template(:fail, error_slug: :inconsistent_types)
@@ -53,17 +54,17 @@ module DatabaseConsistency
         )
       end
 
-      def report_template(status, error_slug: nil) # rubocop:disable Metrics/MethodLength
+      def report_template(status, error_slug: nil) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         Report.new(
           status: status,
           error_slug: error_slug,
           error_message: nil,
           table_to_change: table_to_change,
-          type_to_set: converted_type(primary_column).convert,
-          fk_type: converted_type(associated_column).type,
-          fk_name: associated_key,
-          pk_type: converted_type(primary_column).type,
-          pk_name: primary_key,
+          type_to_set: primary_columns.map { |primary_column| converted_type(primary_column).convert },
+          fk_type: associated_columns.map { |column| converted_type(column).type }.join('+'),
+          fk_name: associated_keys.join('+'),
+          pk_type: primary_columns.map { |primary_column| converted_type(primary_column).type }.join('+'),
+          pk_name: primary_keys.join('+'),
           **report_attributes
         )
       end
@@ -76,36 +77,40 @@ module DatabaseConsistency
                              end
       end
 
-      # @return [String]
-      def primary_key
-        @primary_key ||= if belongs_to_association?
-                           association.association_primary_key
-                         else
-                           association.active_record_primary_key
-                         end.to_s
+      # @return [Array<String>]
+      def primary_keys
+        @primary_keys ||= if belongs_to_association?
+                            Helper.extract_columns(association.association_primary_key)
+                          else
+                            Helper.extract_columns(association.active_record_primary_key)
+                          end
       end
 
-      # @return [String]
-      def associated_key
-        @associated_key ||= association.foreign_key.to_s
+      # @return [Array<String>]
+      def associated_keys
+        @associated_keys ||= Helper.extract_columns(association.foreign_key)
       end
 
-      # @return [ActiveRecord::ConnectionAdapters::Column]
-      def primary_column
-        @primary_column ||= if belongs_to_association?
-                              column(association.klass, primary_key)
-                            else
-                              column(association.active_record, primary_key)
-                            end
+      # @return [Array<ActiveRecord::ConnectionAdapters::Column>]
+      def primary_columns
+        @primary_columns ||= primary_keys.map do |primary_key|
+          if belongs_to_association?
+            column(association.klass, primary_key)
+          else
+            column(association.active_record, primary_key)
+          end
+        end
       end
 
-      # @return [ActiveRecord::ConnectionAdapters::Column]
-      def associated_column
-        @associated_column ||= if belongs_to_association?
-                                 column(association.active_record, associated_key)
-                               else
-                                 column(association.klass, associated_key)
-                               end
+      # @return [Array<ActiveRecord::ConnectionAdapters::Column>]
+      def associated_columns
+        @associated_columns ||= associated_keys.map do |associated_key|
+          if belongs_to_association?
+            column(association.active_record, associated_key)
+          else
+            column(association.klass, associated_key)
+          end
+        end
       end
 
       # @return [DatabaseConsistency::Databases::Factory]
@@ -135,6 +140,12 @@ module DatabaseConsistency
         column.sql_type
       end
 
+      def covers?(associated_types, primary_types)
+        associated_types.zip(primary_types).all? do |associated_type, primary_type|
+          associated_type.cover?(primary_type)
+        end
+      end
+
       # @param [ActiveRecord::ConnectionAdapters::Column]
       #
       # @return [DatabaseConsistency::Databases::Types::Base]

data/lib/database_consistency/helper.rb

@@ -128,7 +128,16 @@ module DatabaseConsistency
     end
 
     def extract_columns(str)
-      str.scan(/(\w+)/).flatten
+      case str
+      when Array
+        str.map(&:to_s)
+      when String
+        str.scan(/(\w+)/).flatten
+      when Symbol
+        [str.to_s]
+      else
+        raise "Unexpected type for columns: #{str.class} with value: #{str}"
+      end
     end
 
     def foreign_key_or_attribute(model, attribute)

data/lib/database_consistency/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_consistency
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-12-10 00:00:00.000000000 Z
+date: 2026-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -275,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Provide an easy way to check the consistency of the database constraints