database_consistency 2.1.1 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0932d2df82273397f2389dada3d7934fa796f9bb9e3b4c07382b629682c7b19d'
-  data.tar.gz: 1d752233498fad2addba69e7b37f5f3a6364493c2bec3883a821901eee2f7061
+  metadata.gz: 67c90295e24b6b49a4e010a612729f86951d2dda7daba5ac06b091e6b435e040
+  data.tar.gz: f1958934302e46a7b21d600a9418bbf58bef2921a5b4d5c2dd5fcccc5a4acda8
 SHA512:
-  metadata.gz: c0cbca026d510fa349ce5a69c39bbc0b0164ee27bc93e3f75870cdb8b026ca59b5fdbd3466b1eec15b89c921d4f917b7a2f12900d6326e30da33a426aadbcfd3
-  data.tar.gz: b2cd0dc46bc459f3dd2b96e7041b7b7de1ab13e5b2eab347283d8d3d89fc64e82cd94051cae052fe0e52c55b517afc510b4cd1e7fda261b420daf518adc5be49
+  metadata.gz: 3bb2a7b1dc68923711cad75c25c2e27a0208ac625a911f61b6e9a6459b5c71640800329f920f14373c4202f100f36b2bf05f2a683772bace47ebc5dd3b3b4ea4
+  data.tar.gz: e6a7b06b4bd9d7b3ff002e24c8a320b952c208e864f07ec4f0c255de23b032f14610bf893cc737d3ca2713f1357ee0e0307d91d4a611c48b693e330b1145891e

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

@@ -24,9 +24,9 @@ module DatabaseConsistency
         @table_or_model_name ||= model.name.to_s
       end
 
-      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? &&
+      def foreign_key # rubocop:disable Metrics/AbcSize
+        model.connection.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
       end

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

@@ -43,7 +43,7 @@ module DatabaseConsistency
       # | persisted   | ok     |
       # | missing     | fail   |
       def check
-        if foreign_key_exists?
+        if foreign_key
           report_template(:ok)
         else
           report_template(:fail, error_slug: :missing_foreign_key)

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/checkers/association_checkers/missing_dependent_destroy_checker.rb

@@ -15,7 +15,7 @@ module DatabaseConsistency
       private
 
       def preconditions
-        association.belongs_to? && foreign_key_exists?
+        association.belongs_to? && foreign_key
       end
 
       def check
@@ -34,13 +34,6 @@ module DatabaseConsistency
         end
       end
 
-      def foreign_key
-        association.klass
-                   .connection
-                   .foreign_keys(model.table_name)
-                   .find { |fk| fk.column == association.foreign_key.to_s }
-      end
-
       def cascade?
         %i[cascade nullify].include? foreign_key.options[:on_delete]
       end

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.3'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: database_consistency
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.3
 platform: ruby
 authors:
 - Evgeniy Demin
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-12-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -136,7 +135,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '1.3'
-description: 
 email:
 - lawliet.djez@gmail.com
 executables:
@@ -275,9 +273,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
-signing_key: 
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Provide an easy way to check the consistency of the database constraints
   with the application validations.
 test_files: []
+...