database_consistency 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6474192e36ae6bcd25dc149e1294ff9c791d2716e2dab3d94191b8c47dd81aef
-  data.tar.gz: d523c7bf119274212cb9da1ead5c04814e970157529e06f03c27b2d7ad2463da
+  metadata.gz: 59cc85177c9762e632bfe92d3b04cef26491e7623494559d254d5d6e26367c7a
+  data.tar.gz: 6ad7b6ecdd81506ddbc9f5b9178a152e5637ee5a3d96a073169007fbfbd05c8a
 SHA512:
-  metadata.gz: 9e90c491f1f0ced39b6ce7b66079586f6f42b0405214392f110ec04d6ee41fbcdd01031ac88fc3dfe662669ae3640957941013981c5965a97b6032d36271f105
-  data.tar.gz: f405932ab3023150e3353b5bfe08e6bb56c79b3af0d55a45c2f449c9dee45d1d44ac255e83fecac8b70d8ff967a1b8fe9fe23016446c53b84a27a12bcb666024
+  metadata.gz: 62182073f827085734ca241142f1f5eb38164d7fbb200da56a0d4f666193455832c6eac1e87fe1b0ca69fd51950a4bd539a924f92c7c7b276638327226abe961
+  data.tar.gz: f719209610b87c17fcc682cfda1e57f6a5754098ddbea47e2824a163b95319aec4f4dac8a02bb2ff8c375dd48ad2e45151536a2edffe2e75c8da9beb15af3fd2

data/lib/database_consistency/checkers/base_checker.rb

@@ -21,8 +21,8 @@ module DatabaseConsistency
         return unless preconditions
 
         @report ||= check
-      rescue StandardError => error
-        RescueError.call(error)
+      rescue StandardError => e
+        RescueError.call(e)
       end
 
       # @return [Hash, nil]

data/lib/database_consistency/checkers/missing_unique_index_checker.rb

@@ -33,17 +33,36 @@ module DatabaseConsistency
 
       def unique_index
         @unique_index ||= model.connection.indexes(model.table_name).find do |index|
-          index.unique && index.columns.sort == sorted_index_columns
+          index.unique && extract_index_columns(index.columns).sort == sorted_index_columns
         end
       end
 
+      # @return [Array<String>]
+      def extract_index_columns(index_columns)
+        return index_columns unless index_columns.is_a?(String)
+
+        index_columns.split(',')
+                     .map(&:strip)
+                     .map { |str| str.gsub(/lower\(/i, 'lower(') }
+                     .map { |str| str.gsub(/\(([^)]+)\)::\w+/, '\1') }
+      end
+
       def index_columns
-        @index_columns ||= ([attribute] + Array.wrap(validator.options[:scope])).map(&:to_s)
+        @index_columns ||= ([wrapped_attribute_name] + Array.wrap(validator.options[:scope])).map(&:to_s)
       end
 
       def sorted_index_columns
         @sorted_index_columns ||= index_columns.sort
       end
+
+      # @return [String]
+      def wrapped_attribute_name
+        if validator.options[:case_sensitive].nil? || validator.options[:case_sensitive]
+          attribute
+        else
+          "lower(#{attribute})"
+        end
+      end
     end
   end
 end

data/lib/database_consistency/checkers/validator_checker.rb

@@ -12,10 +12,12 @@ module DatabaseConsistency
         @validator = validator
       end
 
+      # @return [String]
       def column_or_attribute_name
         @column_or_attribute_name ||= attribute.to_s
       end
 
+      # @return [String]
       def table_or_model_name
         @table_or_model_name ||= model.name.to_s
       end

data/lib/database_consistency/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_consistency
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Provide an easy way to check the consistency of the database constraints