database_consistency 1.7.20 → 1.7.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b23b01d53d9091689967b91ddaf1439ec1397391646ce775bfa4ead5ca2142f
-  data.tar.gz: fc0aa913897643ffb50aa5f8907606c2e592bd3c84ae407b1d9664bc425ae953
+  metadata.gz: 2565af47d96e1c040b197300b6952c0e8c110606f82a842296e50146de96e9eb
+  data.tar.gz: 879efffc98e6e937acbf15e742357d2a5570a19a95f3f43b9ec34ed4a042c5c7
 SHA512:
-  metadata.gz: 7132db37d4d683daead886e87d915763e06a268a387bbaab01cf08ec4a518498644c2ad49ef271ce99976a591bfa31e5beb9067bbeec5faf352a0a03c9cd4ca6
-  data.tar.gz: a57787aa6b06ffc4762e62b97e38f1fb92841b0e54ed5846e22a0179c5208982d1bd14a29b3a7a0d278944802b3af4c4d683c958842c5cdd9b908d94f653157d
+  metadata.gz: 6024ff7d235558f6b0ca703bddee252f4537e305df584ff37c1d8569e291b26e7838f31aa9817820d2ac686196e38ed420b5e2b42d608ad234d91003ebacabac
+  data.tar.gz: 0f5fe6203dbad2c91acbb99cdf4a82cb86cdbc0e5c13535942810f19a30c8b0d72b93392aa75f501b9bfa0b5965780ef798c3439fd19f0512099d0069f1de572

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

@@ -34,7 +34,23 @@ module DatabaseConsistency
       end
 
       def weak_option?
-        validators.all? { |validator| validator.options.slice(*WEAK_OPTIONS).any? }
+        validators.all? do |validator|
+          result = validator.options.slice(*WEAK_OPTIONS).any?
+
+          result = false if required_with_if?(validator)
+
+          result
+        end
+      end
+
+      def belongs_to_required_validates_foreign_key_disabled?
+        ActiveRecord.version >= Gem::Version.new('7.1.0') &&
+          !ActiveRecord.belongs_to_required_validates_foreign_key
+      end
+
+      def required_with_if?(validator)
+        belongs_to_required_validates_foreign_key_disabled? &&
+          validator.options[:message] == :required && validator.options[:if].present?
       end
 
       def check

data/lib/database_consistency/version.rb

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

data/lib/database_consistency.rb

@@ -81,7 +81,7 @@ require 'database_consistency/checkers/column_checkers/length_constraint_checker
 require 'database_consistency/checkers/column_checkers/primary_key_type_checker'
 require 'database_consistency/checkers/column_checkers/enum_value_checker'
 require 'database_consistency/checkers/column_checkers/three_state_boolean_checker'
-require 'database_consistency/checkers/column_checkers/implicit_ordering_checker.rb'
+require 'database_consistency/checkers/column_checkers/implicit_ordering_checker'
 
 require 'database_consistency/checkers/validator_checkers/validator_checker'
 require 'database_consistency/checkers/validator_checkers/missing_unique_index_checker'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_consistency
 version: !ruby/object:Gem::Version
-  version: 1.7.20
+  version: 1.7.21
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-22 00:00:00.000000000 Z
+date: 2023-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord