database_validations 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 397b350ccf27a15694e155a4bb21bae6a01fe94cacceaa14aff89d1db6f542c1
-  data.tar.gz: da042f3adbf3b00a1b85e01a8dd740b23dec523379adc1c5500f1a367f2a0391
+  metadata.gz: 2725c19065bc2a34ba2c1eddc54ab4f7127caf234a9e11be5a08c31388f4d3df
+  data.tar.gz: 6797dde1e63a4701eaa5e8c1c743c57feeae914352407e43c1185d092de1f8b8
 SHA512:
-  metadata.gz: bf357e666a546058018322985ffe4a342d3004d9105c11bcd9e9eeb9b904ce8ecc915960783987b6b57cab8cca26c63eb7d6a788e74f581dc2e8e566f3a32bf9
-  data.tar.gz: 8c9d658eff8041b6237c3b554b82dee7ca390a833aafdfd5d0fc4c7fa6f730241f5a9412c0a8b171ae4df1323e53e1fed796d6782df83b166a76cb78a26ab5e7
+  metadata.gz: a734d277d173977b8c30c3f6952f9458af89bf6eec3e79da3b218c222c8c575f94d163054bfcaf4d9c23b9cf6af2666a3b6794a22c7c013b61518605f57e2663
+  data.tar.gz: 3fba9fd273ca3640fd19854401e42c2c091794dfb763cee8cdaa0c9e80260723cdad9fe66cf9ef0824a476e49766f6d6648309d942d8ad99744963bf0b0d58d9

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

@@ -4,14 +4,15 @@ module DatabaseValidations
       ADAPTER = :mysql2
 
       class << self
-        def unique_index_name(error_message)
-          error_message[/key '([^']+)'/, 1]&.split('.')&.last
+        def unique_index_name(error)
+          error.message[/key '([^']+)'/, 1]&.split('.')&.last
         end
 
-        def unique_error_columns(_error_message); end
+        def unique_error_columns(_error); end
 
-        def foreign_key_error_column(error_message)
-          error_message[/FOREIGN KEY \(`([^`]+)`\)/, 1]
+        def foreign_key_error_column(error)
+          column = error.message[/FOREIGN KEY \(`([^`]+)`\)/, 1]
+          column ? [column] : []
         end
       end
     end

data/lib/database_validations/lib/adapters/postgresql_adapter.rb

@@ -4,16 +4,17 @@ module DatabaseValidations
       ADAPTER = :postgresql
 
       class << self
-        def unique_index_name(error_message)
-          error_message[/unique constraint "([^"]+)"/, 1]
+        def unique_index_name(error)
+          error.message[/unique constraint "([^"]+)"/, 1]
         end
 
-        def unique_error_columns(error_message)
-          error_message[/Key \((.+)\)=/, 1].split(', ')
+        def unique_error_columns(error)
+          error.message[/Key \((.+)\)=/, 1].split(', ')
         end
 
-        def foreign_key_error_column(error_message)
-          error_message[/Key \(([^)]+)\)/, 1]
+        def foreign_key_error_column(error)
+          column = error.message[/Key \(([^)]+)\)/, 1]
+          column ? [column] : []
         end
       end
     end

data/lib/database_validations/lib/adapters/sqlite_adapter.rb

@@ -4,14 +4,21 @@ module DatabaseValidations
       ADAPTER = :sqlite3
 
       class << self
-        def unique_index_name(_error_message); end
+        def unique_index_name(error)
+          error.message[/UNIQUE constraint failed: index '([^']+)'/, 1]
+        end
 
-        def unique_error_columns(error_message)
-          error_message.scan(/\w+\.([^,:]+)/).flatten
+        def unique_error_columns(error)
+          error.message.scan(/\w+\.([^,:]+)/).flatten
         end
 
-        def foreign_key_error_column(error_message)
-          error_message[/\("([^"]+)"\) VALUES/, 1]
+        def foreign_key_error_column(error)
+          return [] unless error.respond_to?(:sql) && error.sql
+
+          columns_clause = error.sql[/\(([^)]+)\)\s*VALUES/i, 1]
+          return [] unless columns_clause
+
+          columns_clause.scan(/"([^"]+)"/).flatten
         end
       end
     end

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

@@ -40,8 +40,8 @@ module DatabaseValidations
 
         validator.attributes.map do |attribute|
           columns = KeyGenerator.unify_columns(attribute, validator.options[:scope])
-          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
+          index = validator.index_name ? adapter.find_unique_index_by_name(validator.index_name.to_s) : adapter.find_unique_index(columns, validator.where) # rubocop:disable Layout/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 Layout/LineLength
         end
       end
     end

data/lib/database_validations/lib/rescuer.rb

@@ -15,21 +15,58 @@ module DatabaseValidations
     end
 
     def process(validate, instance, error, key_types)
+      keys = resolve_keys(instance, error, key_types)
+      attribute_validator = find_matching_validator(instance, keys)
+      return false unless attribute_validator
+
+      process_validator(validate, instance, attribute_validator)
+    end
+
+    def resolve_keys(instance, error, key_types)
       adapter = Adapters.factory(instance.class)
 
-      keys = key_types.map do |key_generator, error_processor|
-        KeyGenerator.public_send(key_generator, adapter.public_send(error_processor, error.message))
+      key_types.flat_map do |key_generator, error_processor|
+        result = adapter.public_send(error_processor, error)
+
+        # FK adapters return an array of candidate columns, each generating a
+        # separate key. Uniqueness adapters return columns that form a single
+        # composite key, passed together to the key generator.
+        if key_generator == :for_db_presence
+          Array(result).map { |column| KeyGenerator.public_send(key_generator, column) }
+        else
+          [KeyGenerator.public_send(key_generator, result)]
+        end
       end
+    end
+
+    def find_matching_validator(instance, keys)
+      first_match = nil
 
       keys.each do |key|
         attribute_validator = instance._db_validators[key]
-
         next unless attribute_validator
 
-        return process_validator(validate, instance, attribute_validator)
+        first_match ||= attribute_validator
+
+        next if (keys.size > 1) && !foreign_key_invalid?(instance, attribute_validator)
+
+        return attribute_validator
       end
 
-      false
+      # TOCTOU fallback: if disambiguate queries all passed (concurrent insert),
+      # use the first matching validator rather than leaving the error unhandled.
+      first_match
+    end
+
+    def foreign_key_invalid?(instance, attribute_validator)
+      attribute = attribute_validator.attribute
+      reflection = instance.class._reflect_on_association(attribute)
+      return true unless reflection
+
+      fk_value = instance.read_attribute(reflection.foreign_key)
+      return true if fk_value.blank?
+
+      !reflection.klass.exists?(reflection.association_primary_key => fk_value)
     end
 
     def process_validator(validate, instance, attribute_validator)

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

@@ -1,6 +1,6 @@
 module DatabaseValidations
   class DbPresenceValidator < ActiveRecord::Validations::PresenceValidator
-    REFLECTION_MESSAGE = ActiveRecord::VERSION::MAJOR < 5 ? :blank : :required
+    REFLECTION_MESSAGE = :required
 
     attr_reader :klass
 
@@ -53,15 +53,11 @@ module DatabaseValidations
     end
 
     def db_belongs_to(name, scope = nil, **options)
-      if ActiveRecord::VERSION::MAJOR < 5
-        options[:required] = false
-      else
-        options[:optional] = true
-      end
+      options[:optional] = true
 
       belongs_to(name, scope, **options)
 
-      validates_with DatabaseValidations::DbPresenceValidator, _merge_attributes([name, message: DatabaseValidations::DbPresenceValidator::REFLECTION_MESSAGE]) # rubocop:disable Metrics/LineLength
+      validates_with DatabaseValidations::DbPresenceValidator, _merge_attributes([name, { message: DatabaseValidations::DbPresenceValidator::REFLECTION_MESSAGE }]) # rubocop:disable Layout/LineLength
     end
   end
 end

data/lib/database_validations/rspec/uniqueness_validator_matcher.rb

@@ -63,15 +63,13 @@ RSpec::Matchers.define :validate_db_uniqueness_of do |field| # rubocop:disable M
       end
     end
 
-    case_sensitive_default = ActiveRecord::VERSION::MAJOR >= 6 ? nil : true
-
     @validators.include?(
       field: field,
       scope: Array.wrap(@scope),
       where: @where,
       message: @message,
       index_name: @index_name,
-      case_sensitive: @case_sensitive.nil? ? case_sensitive_default : @case_sensitive
+      case_sensitive: @case_sensitive.nil? ? nil : @case_sensitive
     )
   end
 

data/lib/database_validations/rubocop/cop/belongs_to.rb

@@ -10,8 +10,9 @@ module RuboCop
       #   # good
       #   db_belongs_to :company
       #
-      class BelongsTo < Cop
+      class BelongsTo < Base
         MSG = 'Use `db_belongs_to`.'.freeze
+        RESTRICT_ON_SEND = %i[belongs_to].freeze
 
         NON_SUPPORTED_OPTIONS = %i[
           optional
@@ -20,14 +21,12 @@ module RuboCop
           foreign_type
         ].freeze
 
-        def_node_matcher :belongs_to?, '(send nil? :belongs_to ...)'
         def_node_matcher :option_name, '(pair (sym $_) ...)'
 
         def on_send(node)
-          return unless belongs_to?(node)
           return unless supported?(node)
 
-          add_offense(node, location: :selector)
+          add_offense(node.loc.selector)
         end
 
         private

data/lib/database_validations/rubocop/cop/uniqueness_of.rb

@@ -14,17 +14,18 @@ module RuboCop
       #   validates_db_uniqueness_of :address, scope: :user_id
       #   validates_db_uniqueness_of :title
       #
-      class UniquenessOf < Cop
+      class UniquenessOf < Base
         MSG = 'Use `validates_db_uniqueness_of`.'.freeze
+        RESTRICT_ON_SEND = %i[validates validates_uniqueness_of].freeze
 
         def_node_matcher :uniquness_validation?, '(pair (sym :uniqueness) _)'
 
         def on_send(node)
           if node.method_name == :validates_uniqueness_of
-            add_offense(node, location: :selector)
+            add_offense(node.loc.selector)
           elsif node.method_name == :validates
             uniqueness(node) do |option|
-              add_offense(option)
+              add_offense(option.loc.expression)
             end
           end
         end

data/lib/database_validations/version.rb

@@ -1,3 +1,3 @@
 module DatabaseValidations
-  VERSION = '1.1.1'.freeze
+  VERSION = '2.0.0'.freeze
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: database_validations
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Evgeniy Demin
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,56 +15,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 7.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: db-query-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -98,72 +97,72 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.60'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.60'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.30'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.30'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 description: |-
   ActiveRecord provides validations on app level but it won't guarantee the
   consistent. In some cases, like `validates_uniqueness_of` it executes
@@ -208,7 +207,6 @@ homepage: https://github.com/toptal/database_validations
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -216,15 +214,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Provide compatibility between database constraints and ActiveRecord validations
   with better performance and consistency.