database_consistency 1.1.1 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 538febddc734f33fc864270c7fcafda018dfae709ee0e462ccb63324054dd796
-  data.tar.gz: 4f8dd5fba8b01d8227b0a5b38a1148a3d29b6ef16712edb1b3d5a05bab2d7791
+  metadata.gz: 8c43909523b8cb7b8369f55dc151bf84e32752276907a249ada7606edffbbdca
+  data.tar.gz: b2a27e403ab36224ab3f432f4bd4d8021e75306c000b8fd20c01ea2cd868d795
 SHA512:
-  metadata.gz: c0ea2899794381c9e1c16b3ad10667aa5798aec73130e8abf6c5688829473de58facfbf15c68db5fb89509fa9d0a855a5828c044b2e4b501d465ef9f43300ad5
-  data.tar.gz: 7d0a59b4772578f7a2338df73de0c534020234e93ea620f48271328e5feaf7a8d7fada08ac9688ca8fe4c62c4bdf300f4689561e7108213b558346e8b9abc279
+  metadata.gz: a7dac1b50e3e621c62f5bb00c96ef130bee3a862d70c3078dc29dd2538ca5f6a66f6772aa449ffed3771354a0514ab21e2b58df4b125dd62415f163b936667ee
+  data.tar.gz: f71af9349ed08f62b295c47cb32dc11a591a59cd44784e8f5ba00390c8011ccbc8597dc6cd63a5db4eee965f1ae0b758c8fa7487503c0f5469c27e492f7bfcd1

data/lib/database_consistency/checkers/{validator_checkers/belongs_to_presence_checker.rb → association_checkers/foreign_key_checker.rb}

@@ -2,18 +2,23 @@
 
 module DatabaseConsistency
   module Checkers
-    # This class checks if required +belongs_to+ has foreign key constraint
-    class BelongsToPresenceChecker < ValidatorChecker
-      MISSING_FOREIGN_KEY = 'model should have proper foreign key in the database'
+    # This class checks if non polymorphic +belongs_to+ association has foreign key constraint
+    class ForeignKeyChecker < AssociationChecker
+      MISSING_FOREIGN_KEY = 'should have foreign key in the database'
 
       private
 
       # We skip check when:
-      #  - validator is a not a presence validator
-      #  - there is no belongs_to association with given name
-      #  - belongs_to association is polymorphic
+      #  - association isn't belongs_to association
+      #  - association is polymorphic
       def preconditions
-        validator.kind == :presence && association && association.belongs_to? && !association.polymorphic?
+        supported? && association.belongs_to? && !association.polymorphic?
+      end
+
+      def supported?
+        return false if ActiveRecord::VERSION::MAJOR < 5 && ActiveRecord::Base.connection_config[:adapter] == 'sqlite3'
+
+        true
       end
 
       # Table of possible statuses
@@ -28,10 +33,6 @@ module DatabaseConsistency
           report_template(:fail, MISSING_FOREIGN_KEY)
         end
       end
-
-      def association
-        @association ||= model.reflect_on_association(attribute)
-      end
     end
   end
 end

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

@@ -6,6 +6,8 @@ module DatabaseConsistency
     class NullConstraintChecker < ColumnChecker
       # Message templates
       VALIDATOR_MISSING = 'column is required in the database but do not have presence validator'
+      ASSOCIATION_VALIDATOR_MISSING = 'column is required in the database but do '\
+                                      'not have presence validator for association (%a_n)'
 
       private
 
@@ -26,21 +28,23 @@ module DatabaseConsistency
       # | missing    | fail   |
       #
       # We consider PresenceValidation, InclusionValidation, ExclusionValidation, NumericalityValidator with nil,
-      # or BelongsTo association using this column
+      # or required BelongsTo association using this column
       def check
         if valid?
           report_template(:ok)
+        elsif belongs_to_association
+          report_template(:fail, ASSOCIATION_VALIDATOR_MISSING.gsub('%a_n', belongs_to_association.name.to_s))
         else
           report_template(:fail, VALIDATOR_MISSING)
         end
       end
 
       def valid?
-        validator?(ActiveModel::Validations::PresenceValidator) ||
-          validator?(ActiveModel::Validations::InclusionValidator) ||
+        validator?(:presence, column.name) ||
+          validator?(:inclusion, column.name) ||
           numericality_validator_without_allow_nil? ||
           nil_exclusion_validator? ||
-          belongs_to_association?
+          (belongs_to_association && validator?(:presence, belongs_to_association.name))
       end
 
       def primary_field?
@@ -52,28 +56,30 @@ module DatabaseConsistency
       end
 
       def nil_exclusion_validator?
-        model.validators.grep(ActiveModel::Validations::ExclusionValidator).any? do |validator|
-          Helper.check_inclusion?(validator.attributes, column.name) &&
+        model.validators.any? do |validator|
+          validator.kind == :exclusion &&
+            Helper.check_inclusion?(validator.attributes, column.name) &&
             validator.options[:in].include?(nil)
         end
       end
 
       def numericality_validator_without_allow_nil?
-        model.validators.grep(ActiveModel::Validations::NumericalityValidator).any? do |validator|
-          Helper.check_inclusion?(validator.attributes, column.name) &&
+        model.validators.any? do |validator|
+          validator.kind == :numericality &&
+            Helper.check_inclusion?(validator.attributes, column.name) &&
             !validator.options[:allow_nil]
         end
       end
 
-      def validator?(validator_class)
-        model.validators.grep(validator_class).any? do |validator|
-          Helper.check_inclusion?(validator.attributes, column.name)
+      def validator?(kind, attribute)
+        model.validators.any? do |validator|
+          validator.kind == kind && Helper.check_inclusion?(validator.attributes, attribute)
         end
       end
 
-      def belongs_to_association?
-        model.reflect_on_all_associations.grep(ActiveRecord::Reflection::BelongsToReflection).any? do |r|
-          Helper.check_inclusion?([r.foreign_key, r.foreign_type], column.name)
+      def belongs_to_association
+        @belongs_to_association ||= model.reflect_on_all_associations.find do |r|
+          r.belongs_to? && Helper.check_inclusion?([r.foreign_key, r.foreign_type], column.name)
         end
       end
     end

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

@@ -7,6 +7,7 @@ module DatabaseConsistency
       WEAK_OPTIONS = %i[allow_nil allow_blank if unless on].freeze
       # Message templates
       CONSTRAINT_MISSING = 'column should be required in the database'
+      ASSOCIATION_FOREIGN_KEY_CONSTRAINT_MISSING = 'association foreign key column should be required in the database'
       POSSIBLE_NULL = 'column is required but there is possible null value insert'
 
       private
@@ -15,11 +16,9 @@ module DatabaseConsistency
         validator.kind == :presence
       end
 
-      # We skip check when:
-      #  - there is no presence validators
-      #  - there is no column in the database with given name
+      # We skip the check when there are no presence validators
       def preconditions
-        validators.any? && column
+        validators.any?
       end
 
       # Table of possible statuses
@@ -33,17 +32,39 @@ module DatabaseConsistency
         can_be_null = column.null
         has_weak_option = validators.all? { |validator| validator.options.slice(*WEAK_OPTIONS).any? }
 
-        if can_be_null == has_weak_option
-          report_template(:ok)
-        elsif can_be_null
+        return report_template(:ok) if can_be_null == has_weak_option
+        return report_template(:fail, POSSIBLE_NULL) unless can_be_null
+
+        if regular_column
           report_template(:fail, CONSTRAINT_MISSING)
         else
-          report_template(:fail, POSSIBLE_NULL)
+          report_template(:fail, ASSOCIATION_FOREIGN_KEY_CONSTRAINT_MISSING)
         end
       end
 
       def column
-        @column ||= model.columns.select.find { |field| field.name == attribute.to_s }
+        @column ||= regular_column || association_reference_column ||
+                    (raise Errors::MissingField, "Missing column in #{model.table_name} for #{attribute}")
+      end
+
+      def regular_column
+        @regular_column ||= column_for_name(attribute.to_s)
+      end
+
+      def column_for_name(name)
+        model.columns.find { |field| field.name == name.to_s }
+      end
+
+      def association_reference_column
+        return unless association_reflection
+
+        column_for_name(association_reflection.foreign_key)
+      end
+
+      def association_reflection
+        model
+          .reflect_on_all_associations
+          .find { |reflection| reflection.belongs_to? && reflection.name == attribute }
       end
     end
   end

data/lib/database_consistency/processors/associations_processor.rb

@@ -6,6 +6,7 @@ module DatabaseConsistency
     class AssociationsProcessor < BaseProcessor
       CHECKERS = [
         Checkers::MissingIndexChecker,
+        Checkers::ForeignKeyChecker,
         Checkers::ForeignKeyTypeChecker
       ].freeze
 

data/lib/database_consistency/processors/validators_processor.rb

@@ -5,7 +5,6 @@ module DatabaseConsistency
     # The class to process validators
     class ValidatorsProcessor < BaseProcessor
       CHECKERS = [
-        Checkers::BelongsToPresenceChecker,
         Checkers::MissingUniqueIndexChecker
       ].freeze
 

data/lib/database_consistency/version.rb

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

data/lib/database_consistency/writers/simple_writer.rb

@@ -21,9 +21,7 @@ module DatabaseConsistency
       end
 
       def msg(result)
-        msg = "#{status_text(result)} #{key_text(result)} #{result.message}"
-        msg += " (checker: #{result.checker_name})" if config.debug?
-        msg
+        "#{result.checker_name} #{status_text(result)} #{key_text(result)} #{result.message}"
       end
 
       private

data/lib/database_consistency.rb

@@ -19,6 +19,7 @@ require 'database_consistency/checkers/base_checker'
 
 require 'database_consistency/checkers/association_checkers/association_checker'
 require 'database_consistency/checkers/association_checkers/missing_index_checker'
+require 'database_consistency/checkers/association_checkers/foreign_key_checker'
 require 'database_consistency/checkers/association_checkers/foreign_key_type_checker'
 
 require 'database_consistency/checkers/column_checkers/column_checker'
@@ -27,7 +28,6 @@ require 'database_consistency/checkers/column_checkers/length_constraint_checker
 require 'database_consistency/checkers/column_checkers/primary_key_type_checker'
 
 require 'database_consistency/checkers/validator_checkers/validator_checker'
-require 'database_consistency/checkers/validator_checkers/belongs_to_presence_checker'
 require 'database_consistency/checkers/validator_checkers/missing_unique_index_checker'
 
 require 'database_consistency/checkers/validators_fraction_checkers/validators_fraction_checker'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_consistency
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.5
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-25 00:00:00.000000000 Z
+date: 2021-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -133,6 +133,7 @@ files:
 - bin/database_consistency
 - lib/database_consistency.rb
 - lib/database_consistency/checkers/association_checkers/association_checker.rb
+- lib/database_consistency/checkers/association_checkers/foreign_key_checker.rb
 - lib/database_consistency/checkers/association_checkers/foreign_key_type_checker.rb
 - lib/database_consistency/checkers/association_checkers/missing_index_checker.rb
 - lib/database_consistency/checkers/base_checker.rb
@@ -144,7 +145,6 @@ files:
 - lib/database_consistency/checkers/index_checkers/redundant_index_checker.rb
 - lib/database_consistency/checkers/index_checkers/redundant_unique_index_checker.rb
 - lib/database_consistency/checkers/index_checkers/unique_index_checker.rb
-- lib/database_consistency/checkers/validator_checkers/belongs_to_presence_checker.rb
 - lib/database_consistency/checkers/validator_checkers/missing_unique_index_checker.rb
 - lib/database_consistency/checkers/validator_checkers/validator_checker.rb
 - lib/database_consistency/checkers/validators_fraction_checkers/column_presence_checker.rb