database_consistency 0.8.5 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed9a2103f6e588628f52a00ddd933b0dc899fac0d6e8752a3bf1111a3894fb17
-  data.tar.gz: d8bf6a551c55fc3e4a33d837354f1b3d777c6171b48aa84d2cce5bbba478e0d5
+  metadata.gz: 3790aaad0e110f0764989efae93b0f0e12e8fd3a915fe8d6ed52fb2dec09646b
+  data.tar.gz: 7d20a3901b932cc31b5c49d4e02dc78725835f13c2d5c7f147a0fe137af35cd1
 SHA512:
-  metadata.gz: a1c59e4de257fdaa7aae63725abcc82f7da1f4ea98f51fc804162b8c5488021c3c665f7e7298b135eaddd50560415b563f0cd608fdaaee81519e44af74966bb2
-  data.tar.gz: 516f5102afb3234eb88d8a8039b584c9210b33d78401290423032cbd017df5218aa6a455ae5faeffb54dd9bad7ea82a17a40f1729255c7ea2ed988924bad3ea9
+  metadata.gz: b6f565eaf656ee1d0b63944ab11ebfec0352286bb0d404070eaab4e58e2ad4e9b810ed95292a0162c8df0119ad75861fd462da188a73b239a89293ac044cfd91
+  data.tar.gz: d66b391ad1b3e84d1e4ad1b839732ea8a695f335f9bb180cea18c7447981cdd3ae947e1df010d5d7c9de0f209176053eba7ccd6a2fb5c32425fe57e8d7ec038d

data/lib/database_consistency.rb

@@ -6,6 +6,7 @@ require 'database_consistency/version'
 require 'database_consistency/helper'
 require 'database_consistency/configuration'
 require 'database_consistency/rescue_error'
+require 'database_consistency/errors'
 
 require 'database_consistency/writers/base_writer'
 require 'database_consistency/writers/simple_writer'

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

@@ -17,8 +17,16 @@ module DatabaseConsistency
 
       private
 
+      # We skip check when:
+      #  - association is polymorphic association
+      #  - association is has_and_belongs_to_many
+      #  - association has `through` option
+      #  - associated class doesn't exist
       def preconditions
-        !association.polymorphic? && association.klass.present?
+        !association.polymorphic? &&
+          association.through_reflection.nil? &&
+          association.klass.present? &&
+          association.macro != :has_and_belongs_to_many
       rescue NameError
         false
       end
@@ -47,12 +55,24 @@ module DatabaseConsistency
 
       # @return [String]
       def base_key
-        @base_key ||= belongs_to_association? ? association.foreign_key : association.active_record_primary_key
+        @base_key ||= (
+          if belongs_to_association?
+            association.foreign_key
+          else
+            association.association_primary_key
+          end
+        ).to_s
       end
 
       # @return [String]
       def associated_key
-        @associated_key ||= belongs_to_association? ? association.active_record_primary_key : association.foreign_key
+        @associated_key ||= (
+          if belongs_to_association?
+            association.association_primary_key
+          else
+            association.foreign_key
+          end
+        ).to_s
       end
 
       # @return [ActiveRecord::ConnectionAdapters::Column]
@@ -75,7 +95,14 @@ module DatabaseConsistency
       #
       # @return [ActiveRecord::ConnectionAdapters::Column]
       def column(model, column_name)
-        model.connection.columns(model.table_name).find { |column| column.name == column_name }
+        model.connection.columns(model.table_name).find { |column| column.name == column_name } ||
+          (raise Errors::MissingField, missing_field_error(model.table_name, column_name))
+      end
+
+      # @return [String]
+      def missing_field_error(table_name, column_name)
+        "Association (#{association.name}) of class (#{association.active_record}) relies on "\
+          "field (#{column_name}) of table (#{table_name}) but it is missing."
       end
 
       # @param [ActiveRecord::ConnectionAdapters::Column] column
@@ -92,11 +119,6 @@ module DatabaseConsistency
         database_factory.type(type(column)).convert
       end
 
-      # @return [Boolean]
-      def supported_type?(column)
-        database_factory.type(type(column)).supported?
-      end
-
       # @return [Boolean]
       def belongs_to_association?
         association.macro == :belongs_to

data/lib/database_consistency/checkers/base_checker.rb

@@ -16,16 +16,20 @@ module DatabaseConsistency
         @checker_name ||= name.split('::').last
       end
 
-      # @return [Hash, nil]
-      def report
+      # @param [Boolean] catch_errors
+      #
+      # @return [Hash, File, nil]
+      def report(catch_errors = true)
         return unless preconditions
 
         @report ||= check
       rescue StandardError => e
+        raise e unless catch_errors
+
         RescueError.call(e)
       end
 
-      # @return [Hash, nil]
+      # @return [Hash, File, nil]
       def report_if_enabled?(configuration)
         report if enabled?(configuration)
       end
@@ -62,7 +66,7 @@ module DatabaseConsistency
         raise NotImplementedError
       end
 
-      # @return [Hash]
+      # @return [OpenStruct]
       def report_template(status, message = nil)
         OpenStruct.new(
           checker_name: checker_name,

data/lib/database_consistency/checkers/validator_checkers/missing_unique_index_checker.rb

@@ -45,6 +45,7 @@ module DatabaseConsistency
                      .map(&:strip)
                      .map { |str| str.gsub(/lower\(/i, 'lower(') }
                      .map { |str| str.gsub(/\(([^)]+)\)::\w+/, '\1') }
+                     .map { |str| str.gsub(/'([^)]+)'::\w+/, '\1') }
       end
 
       def index_columns

data/lib/database_consistency/databases/types/sqlite.rb

@@ -14,7 +14,7 @@ module DatabaseConsistency
 
         # @return [String]
         def convert
-          TYPES[type]
+          TYPES[type] || type
         end
       end
     end

data/lib/database_consistency/errors.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module DatabaseConsistency
+  module Errors
+    # The base error class
+    class Base < StandardError; end
+
+    # The error class for missing field
+    class MissingField < Base; end
+  end
+end

data/lib/database_consistency/helper.rb

@@ -8,7 +8,7 @@ module DatabaseConsistency
     # Returns list of models to check
     def models
       ActiveRecord::Base.descendants.delete_if(&:abstract_class?).delete_if do |klass|
-        !klass.connection.table_exists?(klass.table_name)
+        !klass.connection.table_exists?(klass.table_name) || klass.name.include?('HABTM_')
       end
     end
 

data/lib/database_consistency/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_consistency
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.10
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -149,6 +149,7 @@ files:
 - lib/database_consistency/databases/factory.rb
 - lib/database_consistency/databases/types/base.rb
 - lib/database_consistency/databases/types/sqlite.rb
+- lib/database_consistency/errors.rb
 - lib/database_consistency/helper.rb
 - lib/database_consistency/processors/associations_processor.rb
 - lib/database_consistency/processors/base_processor.rb