database_validations 0.9.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37040902b8f9dd94cbfcc1785129eff2ac2f75eb085f567299852a03f4a83cfa
-  data.tar.gz: c6a2a3331225b8344c23244692296a982ed25405be15650c32bc0815e227c20a
+  metadata.gz: d4f713f4e6cffee98b4e7825fa18de17fdd25780659d0bea75f8fbc90ada6ecd
+  data.tar.gz: 73d3f1d54aaea77a61fbc3fcb221348be0ffcb6430eaeec98c09d6cd1e4ca9a7
 SHA512:
-  metadata.gz: 27f9f74a6f081f343bbe94da77956cd0c06419dcf321d2576a6238f0b2bddb5dd967861deaffe88ab47929e4b3837825fc9c17bf95b4fba83f5fbfd4b07d04e0
-  data.tar.gz: 86f379332348da451c1f2d02e3e4096e528f9e00c25f10fdb8881512d97c10ffdf9ab5cffdc3f4e9ce6ea475e0d3d0a0d75b728fed700f7606ccf07cacfe9bdf
+  metadata.gz: 84927dd603f9f8bf8de7fbe98b5414e40de5c30f3d6adb95f5e1c77eef85c8fb7caef58c618e70ce3272feb6407cba159ce36b294d871eb793b30042b3bc5c28
+  data.tar.gz: b51be17960b5f2ad13ca0c6e128dc3352d5bfc53b94ecd1ea40edf1448da300ba546cf1c94e8965b839f29ea693bb1369a4bee7b1ba92f90e7d256544eec906c

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.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/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

@@ -2,19 +2,19 @@ module DatabaseValidations
   module Rescuer
     module_function
 
-    def handled?(instance, error)
+    def handled?(instance, error, validate)
       Storage.prepare(instance.class) unless Storage.prepared?(instance.class)
 
       case error
       when ActiveRecord::RecordNotUnique
-        process(instance, error, for_unique_index: :unique_index_name, for_db_uniqueness: :unique_error_columns)
+        process(validate, instance, error, for_unique_index: :unique_index_name, for_db_uniqueness: :unique_error_columns)
       when ActiveRecord::InvalidForeignKey
-        process(instance, error, for_db_presence: :foreign_key_error_column)
+        process(validate, instance, error, for_db_presence: :foreign_key_error_column)
       else false
       end
     end
 
-    def process(instance, error, key_types)
+    def process(validate, instance, error, key_types)
       adapter = Adapters.factory(instance.class)
 
       keys = key_types.map do |key_generator, error_processor|
@@ -26,14 +26,14 @@ module DatabaseValidations
 
         next unless attribute_validator
 
-        return process_validator(instance, attribute_validator)
+        return process_validator(validate, instance, attribute_validator)
       end
 
       false
     end
 
-    def process_validator(instance, attribute_validator)
-      return false unless attribute_validator.validator.perform_db_validation?
+    def process_validator(validate, instance, attribute_validator)
+      return false unless attribute_validator.validator.perform_rescue?(validate)
 
       attribute_validator.validator.apply_error(instance, attribute_validator.attribute)
       true

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,21 @@ module DatabaseValidations
     end
 
     def create_or_update(*args, &block)
+      options = args.extract_options!
+      rescue_from_database_exceptions(options[:validate]) { super }
+    end
+
+    private
+
+    def rescue_from_database_exceptions(validate, &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 e unless Rescuer.handled?(self, e, validate)
 
       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,8 +21,8 @@ module DatabaseValidations
       Checkers::DbPresenceValidator.validate!(self)
     end
 
-    def perform_db_validation?
-      true
+    def perform_rescue?(validate)
+      validate != false
     end
 
     # TODO: add support of optional db_belongs_to

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

@@ -29,8 +29,8 @@ module DatabaseValidations
       Checkers::DbUniquenessValidator.validate!(self)
     end
 
-    def perform_db_validation?
-      @mode != :standard
+    def perform_rescue?(validate)
+      (validate != false && @mode != :standard) || @rescue == :always
     end
 
     def validate(record)
@@ -41,7 +41,7 @@ module DatabaseValidations
       error_options = options.except(:case_sensitive, :scope, :conditions)
       error_options[:value] = instance.public_send(attribute)
 
-      instance.errors.add(attribute, :taken, error_options)
+      instance.errors.add(attribute, :taken, **error_options)
     end
 
     private
@@ -50,6 +50,7 @@ module DatabaseValidations
       @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
+      @rescue = (options.delete(:rescue).presence || :default).to_sym
     end
 
     def perform_query?

data/lib/database_validations/version.rb

@@ -1,3 +1,3 @@
 module DatabaseValidations
-  VERSION = '0.9.3'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_validations
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Evgeniy Demin
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-24 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -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
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Provide compatibility between database constraints and ActiveRecord validations
   with better performance and consistency.