database_validations 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc082896680bee591fcbf04d9f9fb469c72c9c1e2c259f5093341e2c1448cd15
-  data.tar.gz: 474977490d71108f408c448bf9b18d404218b2b17f8f3cf7b48a2f945e4535d5
+  metadata.gz: 37040902b8f9dd94cbfcc1785129eff2ac2f75eb085f567299852a03f4a83cfa
+  data.tar.gz: c6a2a3331225b8344c23244692296a982ed25405be15650c32bc0815e227c20a
 SHA512:
-  metadata.gz: eb8e2d716fa3bb7bcb0d04f9e9db16f00587d2a7a3742b3367a0b3bf9bee9c883d0ec4f7144f08f0f7045ebed8a7297f33ea77d4bd192102b56e4087f08cff15
-  data.tar.gz: 0da69998634da7b5b9250ce11e1fda4f6dd3809c57bdf5e302a85ad5c7c25d728a57c21a00d98d5e948bac206ae2d46dab52aa0d01714628826f8691ab8883a4
+  metadata.gz: 27f9f74a6f081f343bbe94da77956cd0c06419dcf321d2576a6238f0b2bddb5dd967861deaffe88ab47929e4b3837825fc9c17bf95b4fba83f5fbfd4b07d04e0
+  data.tar.gz: 86f379332348da451c1f2d02e3e4096e528f9e00c25f10fdb8881512d97c10ffdf9ab5cffdc3f4e9ce6ea475e0d3d0a0d75b728fed700f7606ccf07cacfe9bdf

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

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_validations
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2020-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: Provide compatibility between database constraints and ActiveRecord validations