database_validations 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 054be9ff2f059019142360b2f6b9742c7e7b2bce24d880730813d373342c61d2
-  data.tar.gz: '09f34cda5f9a36847a0b03c53a3ded49ed371e6a23332e0ae2e840a901662dbe'
+  metadata.gz: 2725c19065bc2a34ba2c1eddc54ab4f7127caf234a9e11be5a08c31388f4d3df
+  data.tar.gz: 6797dde1e63a4701eaa5e8c1c743c57feeae914352407e43c1185d092de1f8b8
 SHA512:
-  metadata.gz: 96e7d25b16868daac09d309ff2c25c55d4f1b69c1cfe4e2b02c5943cd1bc21a7ea2286e5d032df2517efd57f69d5add1892c918140e318f54264e8fa15cee198
-  data.tar.gz: cf29eeedc3389ea5678f9864c22e7c0dc74fb98154c7dc00a14c82a5d15c4fc600031488b092ff4285971d4e6a14d0b7177968d67d2afa7dfc20a8c2530f32c2
+  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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: database_validations
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Evgeniy Demin
@@ -15,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
@@ -97,58 +97,58 @@ 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: '1.80'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.80'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +214,7 @@ 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:
   - - ">="