database_validations 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70578fbf45115b1b0a349f2676b2c1a689f2aa8d29da2da189da263306c0b333
-  data.tar.gz: f6fc66d339e488cccdf750103637543ecd39d34a0a84366efa2382addcde6aee
+  metadata.gz: 2e13dbc2023a631be57aaacd12ec2c75ca9b7b355e7015737df4b760713b5756
+  data.tar.gz: 8b84441e52646fba283120a8e33d40bdb43162f31f202e2cd07e6f5fa6dbb03e
 SHA512:
-  metadata.gz: 6d40cf1b7d776cf984846f9cef85f1969271d619ae4ee9b9127fe67307c8983eb0ce385883541394932d9cc1f88a2e69fccdf5ff6b800ee06c5a1f5710b21495
-  data.tar.gz: 1e94c35ae4a40a56e275b6bad79a05cf0c3f29b735cf37495c2fb5e9013d2929ab0a54f025c6221a5fa8179a26d3660c9518ba8d5c1f4310ea3832b4ab4cdb28
+  metadata.gz: 324f867954cf0b2660431e6da9b5851f3ccae84b6ff2e5d10de6149b336387adc7c07a4e295748c75663a18822436c88578c6d246e869238f56d0e3563bc1f2e
+  data.tar.gz: 3d99ab395db1b3b493e372c22674283cd7822bd6de89cbcd71b08218cfec96eee709538dd89a872977edd936434564798a20e1af8e837c1f886fbd3a9f8e345c

data/lib/database_validations/lib/adapters.rb

@@ -8,7 +8,13 @@ module DatabaseValidations
     module_function
 
     def factory(model)
-      case (database = model.connection_config[:adapter].downcase.to_sym)
+      database = if ActiveRecord.version < Gem::Version.new('6.1.0')
+                   model.connection_config[:adapter].downcase.to_sym
+                 else
+                   model.connection_db_config.adapter.downcase.to_sym
+                 end
+
+      case database
       when SqliteAdapter::ADAPTER then SqliteAdapter
       when PostgresqlAdapter::ADAPTER then PostgresqlAdapter
       when MysqlAdapter::ADAPTER then MysqlAdapter

data/lib/database_validations/lib/adapters/base_adapter.rb

@@ -9,18 +9,25 @@ module DatabaseValidations
       end
 
       # @param [String] index_name
-      def find_index_by_name(index_name)
-        indexes.find { |index| index.name == index_name }
+      def find_unique_index_by_name(index_name)
+        unique_indexes.find { |index| index.name == index_name }
       end
 
       # @param [Array<String>] columns
       # @param [String] where
-      def find_index(columns, where)
-        indexes.find { |index| Array.wrap(index.columns).map(&:to_s).sort == columns && index.where == where }
+      def find_unique_index(columns, where)
+        unique_indexes.find { |index| Array.wrap(index.columns).map(&:to_s).sort == columns && index.where == where }
       end
 
-      def indexes
-        model.connection.indexes(model.table_name).select(&:unique)
+      def unique_indexes
+        connection = model.connection
+
+        if connection.schema_cache.respond_to?(:indexes)
+          # Rails 6 only
+          connection.schema_cache.indexes(model.table_name).select(&:unique)
+        else
+          connection.indexes(model.table_name).select(&:unique)
+        end
       end
 
       def foreign_keys

data/lib/database_validations/lib/adapters/mysql_adapter.rb

@@ -5,7 +5,7 @@ module DatabaseValidations
 
       class << self
         def unique_index_name(error_message)
-          error_message[/key '([^']+)'/, 1]
+          error_message[/key '([^']+)'/, 1]&.split('.')&.last
         end
 
         def unique_error_columns(_error_message); end

data/lib/database_validations/lib/checkers/db_uniqueness_validator.rb

@@ -38,8 +38,8 @@ module DatabaseValidations
 
         validator.attributes.map do |attribute|
           columns = KeyGenerator.unify_columns(attribute, validator.options[:scope])
-          index = validator.index_name ? adapter.find_index_by_name(validator.index_name.to_s) : adapter.find_index(columns, validator.where) # rubocop:disable Metrics/LineLength
-          raise Errors::IndexNotFound.new(columns, validator.where, validator.index_name, adapter.indexes, adapter.table_name) unless index && valid_index?(columns, index) # rubocop:disable Metrics/LineLength
+          index = validator.index_name ? adapter.find_unique_index_by_name(validator.index_name.to_s) : adapter.find_unique_index(columns, validator.where) # rubocop:disable Metrics/LineLength
+          raise Errors::IndexNotFound.new(columns, validator.where, validator.index_name, adapter.unique_indexes, adapter.table_name) unless index && valid_index?(columns, index) # rubocop:disable Metrics/LineLength
         end
       end
     end

data/lib/database_validations/lib/rescuer.rb

@@ -24,13 +24,19 @@ module DatabaseValidations
       keys.each do |key|
         attribute_validator = instance._db_validators[key]
 
-        if attribute_validator
-          attribute_validator.validator.apply_error(instance, attribute_validator.attribute)
-          return true
-        end
+        next unless attribute_validator
+
+        return process_validator(instance, attribute_validator)
       end
 
       false
     end
+
+    def process_validator(instance, attribute_validator)
+      return false unless attribute_validator.validator.perform_db_validation?
+
+      attribute_validator.validator.apply_error(instance, attribute_validator.attribute)
+      true
+    end
   end
 end

data/lib/database_validations/lib/uniqueness_key_extractor.rb

@@ -22,7 +22,7 @@ module DatabaseValidations
       else
         validator.attributes.map do |attribute|
           columns = KeyGenerator.unify_columns(attribute, validator.options[:scope])
-          index = adapter.find_index(columns, validator.where)
+          index = adapter.find_unique_index(columns, validator.where)
           [KeyGenerator.for_unique_index(index.name), attribute]
         end.to_h
       end

data/lib/database_validations/lib/validations.rb

@@ -14,16 +14,26 @@ module DatabaseValidations
     end
 
     def create_or_update(*args, &block)
+      options = args.extract_options!
+
+      if options[:validate] == false
+        super
+      else
+        rescue_from_database_exceptions { super }
+      end
+    end
+
+    private
+
+    def rescue_from_database_exceptions(&block)
       self._database_validations_fallback = false
-      ActiveRecord::Base.connection.transaction(requires_new: true) { super }
+      self.class.connection.transaction(requires_new: true, &block)
     rescue ActiveRecord::InvalidForeignKey, ActiveRecord::RecordNotUnique => e
       raise e unless Rescuer.handled?(self, e)
 
       raise ActiveRecord::RecordInvalid, self
     end
 
-    private
-
     def perform_validations(options = {})
       options[:validate] == false || valid_without_database_validations?(options[:context])
     end

data/lib/database_validations/lib/validators/db_presence_validator.rb

@@ -21,6 +21,10 @@ module DatabaseValidations
       Checkers::DbPresenceValidator.validate!(self)
     end
 
+    def perform_db_validation?
+      true
+    end
+
     # TODO: add support of optional db_belongs_to
     def validate(record)
       if record._database_validations_fallback
@@ -55,7 +59,7 @@ module DatabaseValidations
         options[:optional] = true
       end
 
-      belongs_to(name, scope, options)
+      belongs_to(name, scope, **options)
 
       validates_with DatabaseValidations::DbPresenceValidator, _merge_attributes([name, message: DatabaseValidations::DbPresenceValidator::REFLECTION_MESSAGE]) # rubocop:disable Metrics/LineLength
     end

data/lib/database_validations/lib/validators/db_uniqueness_validator.rb

@@ -1,5 +1,7 @@
 module DatabaseValidations
   class DbUniquenessValidator < ActiveRecord::Validations::UniquenessValidator
+    DEFAULT_MODE = :optimized
+
     attr_reader :index_name, :where, :klass
 
     # Used to make 3rd party libraries work correctly
@@ -19,8 +21,7 @@ module DatabaseValidations
         options[:conditions] = -> { where(condition) }
       end
 
-      @index_name = options.delete(:index_name) if options.key?(:index_name)
-      @where = options.delete(:where) if options.key?(:where)
+      handle_custom_options(options)
 
       super
 
@@ -28,8 +29,12 @@ module DatabaseValidations
       Checkers::DbUniquenessValidator.validate!(self)
     end
 
+    def perform_db_validation?
+      @mode != :standard
+    end
+
     def validate(record)
-      super if record._database_validations_fallback
+      super if perform_query? || record._database_validations_fallback
     end
 
     def apply_error(instance, attribute)
@@ -38,6 +43,18 @@ module DatabaseValidations
 
       instance.errors.add(attribute, :taken, error_options)
     end
+
+    private
+
+    def handle_custom_options(options)
+      @index_name = options.delete(:index_name) if options.key?(:index_name)
+      @where = options.delete(:where) if options.key?(:where)
+      @mode = (options.delete(:mode).presence || DEFAULT_MODE).to_sym
+    end
+
+    def perform_query?
+      @mode != :optimized
+    end
   end
 
   module ClassMethods

data/lib/database_validations/rspec/uniqueness_validator_matcher.rb

@@ -41,6 +41,10 @@ RSpec::Matchers.define :validate_db_uniqueness_of do |field| # rubocop:disable M
     @case_sensitive = false
   end
 
+  chain(:case_sensitive) do
+    @case_sensitive = true
+  end
+
   match do |object|
     @validators = []
 
@@ -79,6 +83,7 @@ RSpec::Matchers.define :validate_db_uniqueness_of do |field| # rubocop:disable M
     desc += "where: '#{@where}'; " if @where
     desc += "index_name: '#{@index_name}'; " if @index_name
     desc += 'be case insensitive.' unless @case_sensitive
+    desc += 'be case sensitive.' if @case_sensitive
     desc
   end
 

data/lib/database_validations/version.rb

@@ -1,3 +1,3 @@
 module DatabaseValidations
-  VERSION = '0.9.0'.freeze
+  VERSION = '1.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_validations
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Evgeniy Demin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-18 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +208,7 @@ homepage: https://github.com/toptal/database_validations
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -223,9 +223,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Provide compatibility between database constraints and ActiveRecord validations
   with better performance and consistency.