database_consistency 0.8.6 → 0.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4c8440238a874ddd2ae11563b8b034c64f94e467426ef85afcd8befdf9a55c2
-  data.tar.gz: 7e7275bf7029cf03a0a9d3e35975d1a927a7317d323c2c7db00eb22306f67aca
+  metadata.gz: 964b3ab9787dba65ec8981c690f93ec0b0c5a7848e7e0b835ef2aa9a9a415025
+  data.tar.gz: '09d5264224cf230a7d08157101c16d5fe8fcb180684876265dcb16c6c3ecc3f1'
 SHA512:
-  metadata.gz: dcd5d6ee89a07990da47ad72231aa5884ee8209f071f21a4ab9ae3521f5ae2bd85167b2b31d32052bff081cd240f5965b4eef3f814ab8ce1ee83ab480d9ccaff
-  data.tar.gz: 2ff692d1618d7ef53500ccf3f88bb361c856d62ea7f577ce66a1c18122af0f05c1c55d5023b3313c4a17f55dbd20d14a0193d6116575e1b551651ad5549829ff
+  metadata.gz: 661de8be036f7cd5640e6240e3abd605a013bda1fe2b7fcd52243c88d0b0251f9a57ba852117ec75827d125873f982c9c060d991ace7fff296312f7a3bf390c6
+  data.tar.gz: e87befd21bc84b26608b1ded54a6e0199958e4fe9993071db93d511b6ab223c0cb468851f472ab927f7a46f4c2b9d4ce15bb6649a01e64641a1551d05eb6385c

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

@@ -19,10 +19,14 @@ module DatabaseConsistency
 
       # 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.through_reflection.nil? && association.klass.present?
+        !association.polymorphic? &&
+          association.through_reflection.nil? &&
+          association.klass.present? &&
+          association.macro != :has_and_belongs_to_many
       rescue NameError
         false
       end
@@ -51,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.active_record_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]
@@ -79,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.to_s }
+        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

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/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.6'
+  VERSION = '0.8.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_consistency
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.11
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2020-11-19 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