database_consistency 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 074a7027af87351fbb41c7e7d730568771d9399929c1bcd3794b2c4b2af92c29
-  data.tar.gz: a2d0fcce0d3dc47adf0a7e6081e7ad4489d5770ee0d4c55661e596235425d957
+  metadata.gz: f06f5f350f8f4a0dc3eab32d48b01f61da8fde59ebcbc0fcd35296a5a0a2ecd5
+  data.tar.gz: 13d02eb9836ef51570c33b721909517e1abbbb2d7406e5236a718d040e997f0d
 SHA512:
-  metadata.gz: ccf20c7f82e25eb2e9cd6bc42b87c42cb413d09a368b514cf4f34809884ee015a408e927ddcf3817e94a57f15540744e590839961df9ddb95d0a7ce6b857823c
-  data.tar.gz: 82b30815054c3987d13ea769b0a2b2c6ae7e72a70aa23a39d108e9369b5d8fbc4b864d7275798e4e9f3090b1a8b267b9100c73ee70a5482c94fe0a465edf9350
+  metadata.gz: be22b9c36f696268721fdad8fdb8cb5379cb739261d40577754ede248c4cdfd7cf1858f03a6609c762fa500ce87424b3cfc2ed60c93a437bcb2af15dc92f4f8d
+  data.tar.gz: cdfdaa8f8ba2d0e8af3e510407dcfffb36a1568c380a8be115aa87369bf3f97f45d3c2ebb6587f30a0b2048a576193bf90a168e924f3387f6b05e34f1f4d6ced

data/bin/database_consistency

@@ -39,7 +39,7 @@ opt_parser = OptionParser.new do |opts|
     options[:todo] = true
   end
 
-  opts.on('-fix', '--autofix', 'Automatically fixes issues by adjusting the code or generating missing migrations.') do
+  opts.on('-f', '--autofix', 'Automatically fixes issues by adjusting the code or generating missing migrations.') do
     options[:autofix] = true
   end
 

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

@@ -21,7 +21,7 @@ module DatabaseConsistency
           has_one
           has_many
         ].include?(association.macro) && association.through_reflection.nil? && association.klass
-      rescue NameError
+      rescue StandardError
         false
       end
 

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

@@ -18,22 +18,17 @@ module DatabaseConsistency
         validator.kind == :presence
       end
 
-      # We skip the check when there are no presence validators
       def preconditions
-        column && validators.any? && !association?
+        (regular_column || association) && validators.any?
       end
 
-      def association?
-        model._reflect_on_association(attribute)&.macro == :has_one
-      end
-
-      def report_template(status, error_message: nil, error_slug: nil)
+      def report_template(status, column_name:, error_slug: nil)
         Report.new(
           status: status,
           error_slug: error_slug,
-          error_message: error_message,
+          error_message: nil,
           table_name: model.table_name.to_s,
-          column_name: attribute.to_s,
+          column_name: column_name,
           **report_attributes
         )
       end
@@ -42,56 +37,42 @@ module DatabaseConsistency
         validators.all? { |validator| validator.options.slice(*WEAK_OPTIONS).any? }
       end
 
-      def check # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-        can_be_null = column.null
-        has_weak_option = weak_option?
+      def check
+        return analyse(attribute.to_s, type: :null_constraint_missing) if regular_column
 
-        return report_template(:ok) if can_be_null == has_weak_option
-        return report_template(:fail, error_slug: :possible_null) unless can_be_null
-
-        if regular_column
-          Report.new(
-            status: :fail,
-            error_slug: :null_constraint_missing,
-            error_message: nil,
-            table_name: model.table_name.to_s,
-            column_name: attribute.to_s,
-            **report_attributes
-          )
-        else
-          Report.new(
-            status: :fail,
-            error_slug: :association_missing_null_constraint,
-            error_message: nil,
-            table_name: model.table_name.to_s,
-            column_name: association_reflection.foreign_key.to_s,
-            **report_attributes
-          )
+        reports = [analyse(association.foreign_key.to_s, type: :association_missing_null_constraint)]
+        if association.polymorphic?
+          reports << analyse(association.foreign_type.to_s, type: :association_foreign_type_missing_null_constraint)
         end
-      end
 
-      def column
-        @column ||= (regular_column || association_reference_column)
+        reports
       end
 
-      def regular_column
-        @regular_column ||= column_for_name(attribute.to_s)
-      end
+      def analyse(column_name, type:)
+        field = column(column_name)
 
-      def column_for_name(name)
-        model.columns.find { |field| field.name == name.to_s }
-      end
+        can_be_null = field.null
+        has_weak_option = weak_option?
+
+        return report_template(:ok, column_name: column_name) if can_be_null == has_weak_option
+        return report_template(:fail, error_slug: :possible_null, column_name: column_name) unless can_be_null
 
-      def association_reference_column
-        return unless association_reflection
+        report_template(:fail, error_slug: type, column_name: column_name)
+      end
 
-        column_for_name(association_reflection.foreign_key)
+      def regular_column
+        @regular_column ||= column(attribute.to_s)
       end
 
-      def association_reflection
-        model
+      def association
+        @association ||=
+          model
           .reflect_on_all_associations
-          .find { |reflection| reflection.belongs_to? && reflection.name == attribute }
+          .find { |reflection| reflection.belongs_to? && reflection.name.to_s == attribute.to_s }
+      end
+
+      def column(name)
+        model.columns.find { |field| field.name == name.to_s }
       end
     end
   end

data/lib/database_consistency/processors/associations_processor.rb

@@ -18,7 +18,7 @@ module DatabaseConsistency
           next unless configuration.enabled?(model.name.to_s)
 
           Helper.first_level_associations(model).flat_map do |association|
-            enabled_checkers.map do |checker_class|
+            enabled_checkers.flat_map do |checker_class|
               checker = checker_class.new(model, association)
               checker.report_if_enabled?(configuration)
             end

data/lib/database_consistency/processors/columns_processor.rb

@@ -17,7 +17,7 @@ module DatabaseConsistency
           next unless configuration.enabled?(model.name.to_s)
 
           model.columns.flat_map do |column|
-            enabled_checkers.map do |checker_class|
+            enabled_checkers.flat_map do |checker_class|
               checker = checker_class.new(model, column)
               checker.report_if_enabled?(configuration)
             end

data/lib/database_consistency/processors/enums_processor.rb

@@ -15,7 +15,7 @@ module DatabaseConsistency
           next unless configuration.enabled?(model.name.to_s)
 
           model.defined_enums.keys.flat_map do |enum|
-            enabled_checkers.map do |checker_class|
+            enabled_checkers.flat_map do |checker_class|
               checker = checker_class.new(model, enum)
               checker.report_if_enabled?(configuration)
             end

data/lib/database_consistency/processors/indexes_processor.rb

@@ -19,7 +19,7 @@ module DatabaseConsistency
           indexes = model.connection.indexes(model.table_name)
 
           indexes.flat_map do |index|
-            enabled_checkers.map do |checker_class|
+            enabled_checkers.flat_map do |checker_class|
               checker = checker_class.new(model, index)
               checker.report_if_enabled?(configuration)
             end

data/lib/database_consistency/processors/validators_fractions_processor.rb

@@ -18,7 +18,7 @@ module DatabaseConsistency
           model._validators.flat_map do |attribute, validators|
             next unless attribute
 
-            enabled_checkers.map do |checker_class|
+            enabled_checkers.flat_map do |checker_class|
               checker = checker_class.new(model, attribute, validators)
               checker.report_if_enabled?(configuration)
             end

data/lib/database_consistency/processors/validators_processor.rb

@@ -19,7 +19,7 @@ module DatabaseConsistency
             next unless validator.respond_to?(:attributes)
 
             validator.attributes.flat_map do |attribute|
-              enabled_checkers.map do |checker_class|
+              enabled_checkers.flat_map do |checker_class|
                 checker = checker_class.new(model, attribute, validator)
                 checker.report_if_enabled?(configuration)
               end

data/lib/database_consistency/version.rb

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

data/lib/database_consistency/writers/autofix_writer.rb

@@ -8,6 +8,7 @@ module DatabaseConsistency
       SLUG_TO_GENERATOR = {
         association_missing_index: Autofix::AssociationMissingIndex,
         association_missing_null_constraint: Autofix::NullConstraintMissing,
+        association_foreign_type_missing_null_constraint: Autofix::NullConstraintMissing,
         has_one_missing_unique_index: Autofix::HasOneMissingUniqueIndex,
         inconsistent_types: Autofix::InconsistentTypes,
         missing_foreign_key: Autofix::MissingForeignKey,

data/lib/database_consistency/writers/simple/association_foreign_type_missing_null_constraint.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module DatabaseConsistency
+  module Writers
+    module Simple
+      class AssociationForeignTypeMissingNullConstraint < Base # :nodoc:
+        private
+
+        def template
+          'association foreign type column should be required in the database'
+        end
+
+        def unique_attributes
+          {
+            table_name: report.table_name,
+            column_name: report.column_name
+          }
+        end
+      end
+    end
+  end
+end

data/lib/database_consistency/writers/simple_writer.rb

@@ -8,6 +8,7 @@ module DatabaseConsistency
       SLUG_TO_WRITER = {
         association_missing_index: Simple::AssociationMissingIndex,
         association_missing_null_constraint: Simple::AssociationMissingNullConstraint,
+        association_foreign_type_missing_null_constraint: Simple::AssociationForeignTypeMissingNullConstraint,
         has_one_missing_unique_index: Simple::HasOneMissingUniqueIndex,
         inconsistent_types: Simple::InconsistentTypes,
         length_validator_greater_limit: Simple::LengthValidatorGreaterLimit,

data/lib/database_consistency.rb

@@ -22,6 +22,7 @@ require 'database_consistency/writers/simple/missing_foreign_key_cascade'
 require 'database_consistency/writers/simple/redundant_unique_index'
 require 'database_consistency/writers/simple/association_missing_index'
 require 'database_consistency/writers/simple/association_missing_null_constraint'
+require 'database_consistency/writers/simple/association_foreign_type_missing_null_constraint'
 require 'database_consistency/writers/simple/has_one_missing_unique_index'
 require 'database_consistency/writers/simple/length_validator_lower_limit'
 require 'database_consistency/writers/simple/length_validator_greater_limit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_consistency
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.3
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-29 00:00:00.000000000 Z
+date: 2022-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -201,6 +201,7 @@ files:
 - lib/database_consistency/writers/autofix/templates/redundant_index.tt
 - lib/database_consistency/writers/autofix_writer.rb
 - lib/database_consistency/writers/base_writer.rb
+- lib/database_consistency/writers/simple/association_foreign_type_missing_null_constraint.rb
 - lib/database_consistency/writers/simple/association_missing_index.rb
 - lib/database_consistency/writers/simple/association_missing_null_constraint.rb
 - lib/database_consistency/writers/simple/base.rb