database_consistency 1.1.11 → 1.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f837d273af4845f139d3dc53fd3131d4224383576939984865480b65a022ad07
-  data.tar.gz: acba58e69f8a8a8b2083318e983bac226c0681fb5925e927a412fee573ccdc7b
+  metadata.gz: e7986728aea3224bf5a8f04ef65847f88bfe517b4c7b0b3b4361c7a0dbdd2a2d
+  data.tar.gz: d7225b7dadd93850c02c0282974dc01d4c8ae6c2ded3638e996d6aa3fe29fdbe
 SHA512:
-  metadata.gz: 386730f70655e59069f9d90a42a8dcba7d4ed9fefb61ac0d6abcd56bce725be7a699441f7d8b357964c773e06f3d362c6d289d1dfc19c1e334d1b2e956e64875
-  data.tar.gz: b37bee82b425c808658369824084fa92a93ff9a733464303b0343bfbf42f6c493286edafd87d051b78810c1d6b5d6eb85ba2fb09d637f10dca9bb22e35dce283
+  metadata.gz: ed7beed1d43e74309e173bfba69ebb82dc4948b73b31413c43d7454a4f3c165ef68328d902278bf8e1bf527897da9848213f477779f3a48d198a580a17b8f9ef
+  data.tar.gz: 0f00c0005e59a6f374c58d25b3554405edf78eb592908603b46224ca7aff86c0e9d39e2a1bb642d6ea0a69100d8df0bf8564c184e8d3ee4b88f93cfdafa75fb1

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

@@ -7,6 +7,7 @@ module DatabaseConsistency
       attr_reader :model, :association
 
       def initialize(model, association)
+        super()
         @model = model
         @association = association
       end

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

@@ -9,10 +9,17 @@ module DatabaseConsistency
       private
 
       # We skip check when:
+      #  - underlying models belong to different databases
       #  - association isn't belongs_to association
       #  - association is polymorphic
       def preconditions
-        supported? && association.belongs_to? && !association.polymorphic?
+        supported? &&
+          association.belongs_to? && !association.polymorphic? &&
+          same_database?
+      end
+
+      def same_database?
+        Helper.connection_config(model) == Helper.connection_config(association.klass)
       end
 
       def supported?

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

@@ -6,6 +6,7 @@ module DatabaseConsistency
     class MissingIndexChecker < AssociationChecker
       # Message templates
       MISSING_INDEX = 'associated model should have proper index in the database'
+      MISSING_UNIQUE_INDEX = 'associated model should have proper unique index in the database'
 
       private
 
@@ -28,6 +29,22 @@ module DatabaseConsistency
       # | persisted    | ok     |
       # | missing      | fail   |
       def check
+        if unique_has_one_association?
+          check_unique_has_one
+        else
+          check_remaining
+        end
+      end
+
+      def check_unique_has_one
+        if unique_index
+          report_template(:ok)
+        else
+          report_template(:fail, MISSING_UNIQUE_INDEX)
+        end
+      end
+
+      def check_remaining
         if index
           report_template(:ok)
         else
@@ -35,9 +52,19 @@ module DatabaseConsistency
         end
       end
 
+      def unique_has_one_association?
+        association.scope.nil? && association.macro == :has_one && !association.options[:as].present?
+      end
+
+      def unique_index
+        @unique_index ||= association.klass.connection.indexes(association.klass.table_name).find do |index|
+          index_keys(index) == association_keys && index.unique
+        end
+      end
+
       def index
         @index ||= association.klass.connection.indexes(association.klass.table_name).find do |index|
-          index_keys(index) == association_keys
+          index_keys(index, limit: association_keys.size) == association_keys
         end
       end
 
@@ -45,10 +72,16 @@ module DatabaseConsistency
         @association_keys ||= [association.foreign_key, association.type].compact.map(&:to_s).sort
       end
 
-      def index_keys(index)
+      def index_keys(index, limit: nil)
         return unless index.columns.is_a?(Array)
 
-        index.columns[0...association_keys.size].sort
+        columns = index.columns
+
+        if limit
+          columns.first(limit).sort
+        else
+          columns
+        end
       end
     end
   end

data/lib/database_consistency/checkers/base_checker.rb

@@ -19,7 +19,7 @@ module DatabaseConsistency
       # @param [Boolean] catch_errors
       #
       # @return [Hash, File, nil]
-      def report(catch_errors = true)
+      def report(catch_errors: true)
         return unless preconditions
 
         @report ||= check

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

@@ -7,6 +7,7 @@ module DatabaseConsistency
       attr_reader :model, :column
 
       def initialize(model, column)
+        super()
         @model = model
         @column = column
       end

data/lib/database_consistency/checkers/index_checkers/index_checker.rb

@@ -7,6 +7,7 @@ module DatabaseConsistency
       attr_reader :model, :index
 
       def initialize(model, index)
+        super()
         @model = model
         @index = index
       end

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

@@ -7,6 +7,7 @@ module DatabaseConsistency
       attr_reader :model, :attribute, :validator
 
       def initialize(model, attribute, validator)
+        super()
         @model = model
         @attribute = attribute
         @validator = validator

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

@@ -7,6 +7,7 @@ module DatabaseConsistency
       attr_reader :model, :attribute, :validators
 
       def initialize(model, attribute, validators)
+        super()
         @model = model
         @attribute = attribute
         @validators = validators.select(&method(:filter))

data/lib/database_consistency/helper.rb

@@ -13,10 +13,20 @@ module DatabaseConsistency
       end
     end
 
+    def connection_config(klass)
+      if klass.respond_to?(:connection_config)
+        klass.connection_config
+      else
+        klass.connection_db_config.configuration_hash
+      end
+    end
+
     # 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.name.include?('HABTM_')
+      ActiveRecord::Base.descendants.delete_if(&:abstract_class?).select do |klass|
+        klass.connection.table_exists?(klass.table_name) &&
+          !klass.name.include?('HABTM_') &&
+          project_klass?(klass)
       end
     end
 
@@ -27,6 +37,15 @@ module DatabaseConsistency
       end
     end
 
+    # @param klass [ActiveRecord::Base]
+    #
+    # @return [Boolean]
+    def project_klass?(klass)
+      return true unless Module.respond_to?(:const_source_location) && defined?(Bundler)
+
+      !Module.const_source_location(klass.to_s).first.to_s.include?(Bundler.bundle_path.to_s)
+    end
+
     # @return [Boolean]
     def check_inclusion?(array, element)
       array.include?(element.to_s) || array.include?(element.to_sym)

data/lib/database_consistency/version.rb

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

data/lib/database_consistency/writers/simple_writer.rb

@@ -12,6 +12,12 @@ module DatabaseConsistency
         red: "\e[31m"
       }.freeze
 
+      COLOR_BY_STATUS = {
+        ok: :green,
+        warning: :yellow,
+        fail: :red
+      }.freeze
+
       def write
         results.each do |result|
           next unless write?(result.status)
@@ -31,11 +37,7 @@ module DatabaseConsistency
       end
 
       def status_text(result)
-        color = case result.status
-                when :ok then :green
-                when :warning then :yellow
-                when :fail then :red
-                end
+        color = COLOR_BY_STATUS[result.status]
 
         colorize(result.status, color)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_consistency
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.15
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-15 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Provide an easy way to check the consistency of the database constraints