database_consistency 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bc1994c7c24ab9a38d97c764fb0d9ce55e4fa71934df313f2cc693c466cecb7
-  data.tar.gz: 04110bdba61254592c2b22323555948ad06a78b8a63ce78a40175005096acb54
+  metadata.gz: 5c6d7fe7d9a50ab2233cca7b018d096f9d47b850e2fb92b2724fecba15eb78e6
+  data.tar.gz: 5c98abb3adb05dfddb3c586e3eae4a87d35069d07332c516154791514cc9c70f
 SHA512:
-  metadata.gz: 581c8660605072f0cd877310813d71781b50de0af57aa5d85b216b57dd3ed040dc90944e165e51ff9b4728d180474157281ce1e028d9295b7137657367a4fa80
-  data.tar.gz: 0c9d42d9902485c01d208ac38110aa4c7742b4ceca00c369c4fc4c014e84df038b708f17b084f9cee7da8eef28a1f31b52d4a29fa2f597f7cf454af1cefc828c
+  metadata.gz: 32ee0e823c4c893f5e062f847f33dca5fe6094bfc98d12786f879cbe6a2d2182a44f5d9756271550b524093c56030d38f72ce4ff58de6175b2936852e3e7d3d0
+  data.tar.gz: 210a2a55056fee4992ad8e7b719aa42604b03944891e2061976b27972ad8fd5c7b8ac920fb5b888f193a0dd2fbb27e2a205ffba1252a83c736a5926a471641db

data/lib/database_consistency/checkers/enum_checkers/enum_type_checker.rb

@@ -4,8 +4,6 @@ module DatabaseConsistency
   module Checkers
     # This class checks enum types consistency
     class EnumTypeChecker < EnumChecker
-      MissingColumn = Class.new(StandardError)
-
       Report = DatabaseConsistency::ReportBuilder.define(
         DatabaseConsistency::Report,
         :column_type,
@@ -15,7 +13,7 @@ module DatabaseConsistency
       private
 
       def preconditions
-        true
+        column.present?
       end
 
       def check
@@ -53,10 +51,11 @@ module DatabaseConsistency
         model.defined_enums[enum].values.map(&:class).uniq
       end
 
-      def column_type
-        column = model.columns.find { |c| c.name.to_s == enum.to_s }
-        raise MissingColumn unless column
+      def column
+        @column ||= model.columns.find { |c| c.name.to_s == enum.to_s }
+      end
 
+      def column_type
         column.type.to_s
       end
 

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

@@ -20,26 +20,13 @@ module DatabaseConsistency
 
       # We skip the check when there are no presence validators
       def preconditions
-        validators.any? && !association?
+        column && validators.any? && !association?
       end
 
       def association?
         model._reflect_on_association(attribute)&.macro == :has_one
       end
 
-      # Table of possible statuses
-      # | allow_nil/allow_blank/if/unless | database | status |
-      # | ------------------------------- | -------- | ------ |
-      # | at least one provided           | required | fail   |
-      # | at least one provided           | optional | ok     |
-      # | all missing                     | required | ok     |
-      # | all missing                     | optional | fail   |
-      def check
-        report_message
-      rescue Errors::MissingField => e
-        report_template(:fail, error_message: e.message)
-      end
-
       def report_template(status, error_message: nil, error_slug: nil)
         Report.new(
           status: status,
@@ -55,7 +42,7 @@ module DatabaseConsistency
         validators.all? { |validator| validator.options.slice(*WEAK_OPTIONS).any? }
       end
 
-      def report_message # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      def check # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         can_be_null = column.null
         has_weak_option = weak_option?
 
@@ -84,9 +71,7 @@ module DatabaseConsistency
       end
 
       def column
-        @column ||= regular_column ||
-                    association_reference_column ||
-                    (raise Errors::MissingField, "column (#{attribute}) is missing in table (#{model.table_name}) but used for presence validation") # rubocop:disable Layout/LineLength
+        @column ||= (regular_column || association_reference_column)
       end
 
       def regular_column

data/lib/database_consistency/version.rb

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

data/lib/database_consistency/writers/autofix/migration_base.rb

@@ -17,7 +17,9 @@ module DatabaseConsistency
         private
 
         def migration
-          File.read(template_path) % attributes.merge(migration_configuration(migration_name))
+          attributes.merge(migration_configuration(migration_name)).reduce(File.read(template_path)) do |str, (k, v)|
+            str.gsub("%<#{k}>s", v.to_s)
+          end
         end
       end
     end

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

@@ -47,7 +47,9 @@ module DatabaseConsistency
         end
 
         def message_text
-          template % attributes
+          attributes.reduce(template) do |str, (k, v)|
+            str.gsub("%<#{k}>s", v.to_s)
+          end
         end
 
         def attributes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: database_consistency
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Evgeniy Demin