database_consistency 1.5.3 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f06f5f350f8f4a0dc3eab32d48b01f61da8fde59ebcbc0fcd35296a5a0a2ecd5
-  data.tar.gz: 13d02eb9836ef51570c33b721909517e1abbbb2d7406e5236a718d040e997f0d
+  metadata.gz: de35bff4be332ceca4a982d5cde674db49db44a53d3fce22e177cc561cfe6253
+  data.tar.gz: 9f519c9b7aef026da3033790b47690c513871b725b5271e77afa55f29014480f
 SHA512:
-  metadata.gz: be22b9c36f696268721fdad8fdb8cb5379cb739261d40577754ede248c4cdfd7cf1858f03a6609c762fa500ce87424b3cfc2ed60c93a437bcb2af15dc92f4f8d
-  data.tar.gz: cdfdaa8f8ba2d0e8af3e510407dcfffb36a1568c380a8be115aa87369bf3f97f45d3c2ebb6587f30a0b2048a576193bf90a168e924f3387f6b05e34f1f4d6ced
+  metadata.gz: bdbd9750c5a9f8470a0c73fbae78a50193b423367b934f244fe0132e0dc9af29011cf55b8ef67a6dbe22f7fee3b4bbc012069dac2ae329ccad6f43452f83c80d
+  data.tar.gz: 133abb119e8a80c25b6c4fe0936273dd328adbd6df7bc290ea16f97e695b6468f99a0b9c10bea0420dbc1788de88c73948ea429981b30812002a7b103b2f9ddf

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

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+module DatabaseConsistency
+  module Checkers
+    # This class checks missing presence validator
+    class EnumValueChecker < ColumnChecker
+      Report = ReportBuilder.define(
+        DatabaseConsistency::Report,
+        :enum_values,
+        :declared_values
+      )
+
+      private
+
+      def report_template(status, declared_values, error_slug: nil)
+        Report.new(
+          status: status,
+          error_slug: error_slug,
+          error_message: nil,
+          enum_values: enum_column_values,
+          declared_values: declared_values,
+          **report_attributes
+        )
+      end
+
+      def preconditions
+        postgresql? && column.type == :enum && (enum || inclusion_validator)
+      end
+
+      def postgresql?
+        Helper.adapter == 'postgresql'
+      end
+
+      def check
+        [
+          (verify_enum if enum),
+          (verify_inclusion_validator if inclusion_validator)
+        ].compact
+      end
+
+      def enum_column_values
+        @enum_column_values ||= begin
+          _, values = model.connection.enum_types.find { |(enum, _)| enum == column.sql_type }
+          values.split(',').map(&:strip)
+        end
+      end
+
+      def verify_enum
+        values = enum.values.uniq
+
+        if enum_column_values == values
+          report_template(:ok, values)
+        else
+          report_template(:fail, values, error_slug: :enum_values_inconsistent_with_ar_enum)
+        end
+      end
+
+      def verify_inclusion_validator
+        values = validator_values(inclusion_validator).uniq
+
+        if enum_column_values == values
+          report_template(:ok, values)
+        else
+          report_template(:fail, values, error_slug: :enum_values_inconsistent_with_inclusion)
+        end
+      end
+
+      def validator_values(validator)
+        validator.options[:in] || validator.options[:within]
+      end
+
+      def simple_values_validator?(validator)
+        values = validator_values(validator)
+
+        values.is_a?(Array) && values.all? { |val| val.is_a?(String) }
+      end
+
+      def inclusion_validator
+        @inclusion_validator ||= model.validators.find do |validator|
+          validator.kind == :inclusion &&
+            Helper.check_inclusion?(validator.attributes, column.name) &&
+            simple_values_validator?(validator)
+        end
+      end
+
+      def enum
+        @enum ||= model.defined_enums[column.name]
+      end
+    end
+  end
+end

data/lib/database_consistency/processors/columns_processor.rb

@@ -7,7 +7,8 @@ module DatabaseConsistency
       CHECKERS = [
         Checkers::NullConstraintChecker,
         Checkers::LengthConstraintChecker,
-        Checkers::PrimaryKeyTypeChecker
+        Checkers::PrimaryKeyTypeChecker,
+        Checkers::EnumValueChecker
       ].freeze
 
       private

data/lib/database_consistency/version.rb

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

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module DatabaseConsistency
+  module Writers
+    module Simple
+      class EnumValuesInconsistentWithArEnum < Base # :nodoc:
+        private
+
+        def template
+          'enum has [%<enum_values>s] values but ActiveRecord enum has [%<declared_values>s] values'
+        end
+
+        def attributes
+          {
+            enum_values: report.enum_values.join(', '),
+            declared_values: report.declared_values.join(', ')
+          }
+        end
+
+        def unique_attributes
+          {
+            table_or_model_name: report.table_or_model_name,
+            column_or_attribute_name: report.column_or_attribute_name,
+            ar_enum: true
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module DatabaseConsistency
+  module Writers
+    module Simple
+      class EnumValuesInconsistentWithInclusion < Base # :nodoc:
+        private
+
+        def template
+          'enum has [%<enum_values>s] values but ActiveRecord inclusion validation has [%<declared_values>s] values'
+        end
+
+        def attributes
+          {
+            enum_values: report.enum_values.join(', '),
+            declared_values: report.declared_values.join(', ')
+          }
+        end
+
+        def unique_attributes
+          {
+            table_or_model_name: report.table_or_model_name,
+            column_or_attribute_name: report.column_or_attribute_name,
+            inclusion: true
+          }
+        end
+      end
+    end
+  end
+end

data/lib/database_consistency/writers/simple_writer.rb

@@ -25,7 +25,9 @@ module DatabaseConsistency
         redundant_unique_index: Simple::RedundantUniqueIndex,
         small_primary_key: Simple::SmallPrimaryKey,
         inconsistent_enum_type: Simple::InconsistentEnumType,
-        missing_foreign_key_cascade: Simple::MissingForeignKeyCascade
+        missing_foreign_key_cascade: Simple::MissingForeignKeyCascade,
+        enum_values_inconsistent_with_ar_enum: Simple::EnumValuesInconsistentWithArEnum,
+        enum_values_inconsistent_with_inclusion: Simple::EnumValuesInconsistentWithInclusion
       }.freeze
 
       def write

data/lib/database_consistency.rb

@@ -35,6 +35,8 @@ require 'database_consistency/writers/simple/null_constraint_missing'
 require 'database_consistency/writers/simple/possible_null'
 require 'database_consistency/writers/simple/small_primary_key'
 require 'database_consistency/writers/simple/inconsistent_enum_type'
+require 'database_consistency/writers/simple/enum_values_inconsistent_with_ar_enum'
+require 'database_consistency/writers/simple/enum_values_inconsistent_with_inclusion'
 require 'database_consistency/writers/simple_writer'
 
 require 'database_consistency/writers/autofix/helpers/migration'
@@ -67,6 +69,7 @@ require 'database_consistency/checkers/column_checkers/column_checker'
 require 'database_consistency/checkers/column_checkers/null_constraint_checker'
 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/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.5.3
+  version: 1.6.0
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-01 00:00:00.000000000 Z
+date: 2022-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -153,6 +153,7 @@ files:
 - lib/database_consistency/checkers/association_checkers/missing_index_checker.rb
 - lib/database_consistency/checkers/base_checker.rb
 - lib/database_consistency/checkers/column_checkers/column_checker.rb
+- lib/database_consistency/checkers/column_checkers/enum_value_checker.rb
 - lib/database_consistency/checkers/column_checkers/length_constraint_checker.rb
 - lib/database_consistency/checkers/column_checkers/null_constraint_checker.rb
 - lib/database_consistency/checkers/column_checkers/primary_key_type_checker.rb
@@ -206,6 +207,8 @@ files:
 - lib/database_consistency/writers/simple/association_missing_null_constraint.rb
 - lib/database_consistency/writers/simple/base.rb
 - lib/database_consistency/writers/simple/default_message.rb
+- lib/database_consistency/writers/simple/enum_values_inconsistent_with_ar_enum.rb
+- lib/database_consistency/writers/simple/enum_values_inconsistent_with_inclusion.rb
 - lib/database_consistency/writers/simple/has_one_missing_unique_index.rb
 - lib/database_consistency/writers/simple/inconsistent_enum_type.rb
 - lib/database_consistency/writers/simple/inconsistent_types.rb