database_validations 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37040902b8f9dd94cbfcc1785129eff2ac2f75eb085f567299852a03f4a83cfa
-  data.tar.gz: c6a2a3331225b8344c23244692296a982ed25405be15650c32bc0815e227c20a
+  metadata.gz: 5cea34b87885accbde526d9a36bcfcda30b0ae23dd474ee9d3ccbd19b729cdb5
+  data.tar.gz: bf86e7012afed03710c09ab205388d08a6c0c3b34a8cce77423fca40916ae03e
 SHA512:
-  metadata.gz: 27f9f74a6f081f343bbe94da77956cd0c06419dcf321d2576a6238f0b2bddb5dd967861deaffe88ab47929e4b3837825fc9c17bf95b4fba83f5fbfd4b07d04e0
-  data.tar.gz: 86f379332348da451c1f2d02e3e4096e528f9e00c25f10fdb8881512d97c10ffdf9ab5cffdc3f4e9ce6ea475e0d3d0a0d75b728fed700f7606ccf07cacfe9bdf
+  metadata.gz: 1ed0995301de6de0e5169d0e5b3e333ce9b0417014e423094aa5293055dec0ee8657f1a8661d466f8ccdce64020e33378c4c4f4623da5fa5b6755408e0253ff4
+  data.tar.gz: 3d08f422bff52c0e3942dbdb60ab867c891bd1802f12f90fd97305a66bc5bdf01158aa5ba94c418fab6e8ed88db41cc05cacaee47a7ddad95d77dffdfd6c799e

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_validations
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-24 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord