database_consistency 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33bfe05b79b4c641cfa784c2e60894004910bfcbf594d3045ce51b586eec5812
-  data.tar.gz: 20355a79ba3aa941f85764203474e8a16b5c91397ce008940f4ecb9a2e45d71a
+  metadata.gz: 8c43909523b8cb7b8369f55dc151bf84e32752276907a249ada7606edffbbdca
+  data.tar.gz: b2a27e403ab36224ab3f432f4bd4d8021e75306c000b8fd20c01ea2cd868d795
 SHA512:
-  metadata.gz: 57e588223f73d55f10d00e47c7492de68849f3487a272293beb8eba3547bea679f4c2322a93fc2ac625177426252ba1d97650197515493a17218face6149b493
-  data.tar.gz: d21a4eab903327f8fd7ea775828c45c72674f6edf58b1f8fb0889cd986a79adaf514a160bb30497b9b46003b180888b97ddfe94c25b68a106ed4e15a97d8d25b
+  metadata.gz: a7dac1b50e3e621c62f5bb00c96ef130bee3a862d70c3078dc29dd2538ca5f6a66f6772aa449ffed3771354a0514ab21e2b58df4b125dd62415f163b936667ee
+  data.tar.gz: f71af9349ed08f62b295c47cb32dc11a591a59cd44784e8f5ba00390c8011ccbc8597dc6cd63a5db4eee965f1ae0b758c8fa7487503c0f5469c27e492f7bfcd1

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_consistency
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2021-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord