activerecord-rescue_from_duplicate 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e6132feb5c01f32d458d37eeccdc5551263280c72040d5718e10d53795d9c98
-  data.tar.gz: 5f9e6a0f3a05e9ced301db7f25f51176292af0fa33f0c9fe3dc3b91f7bceaef3
+  metadata.gz: 00a9576198c85da3503fc44c7420dd287082a3a8219fe716cd88340ab8da432d
+  data.tar.gz: 196bb9b82c0d333e4fdbaf254992f9e2cf997d62d171420bff1859bdf4d1aca8
 SHA512:
-  metadata.gz: '09bdf44118974354a00a74635d8b3b277f85bb9adf8d1fc48a186699962de82e834fef26ac5dc599a7b039c085eeb30815f900649e7ab0c5a33c4510fa3e5ede'
-  data.tar.gz: 03bc4fe8d528ab693e0619114af9662fecc5dcf914ce41ca5b1c8c98613f9c893afea72e5f6b5de303c7ef50324c9c83da107f807a1d9b54f69a92cfbd96705b
+  metadata.gz: df70343a3219b0c4c2ce0497329d3f59ac3c1e60b6888fabb8b1b5a0562981d1a1b0a27ad1eb0f52e7b190dbfb7584cd6dbbcf72df9f4672b8d4de34f04807cd
+  data.tar.gz: fb404a3201ab1bc5739a4ac71686d7bb5002ce849e439c87063aa9f530f9390165e9044a549bcc733fcc15d7d004c4dd5b1386b1b8a203be4762c5f94bb03c9d

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: weekly

data/.github/workflows/ci.yml

@@ -24,15 +24,16 @@ jobs:
           MYSQL_DATABASE: "rescue_from_duplicate"
         ports:
           - "3306:3306"
+        options: --health-cmd "mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 10
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.2"]
+        ruby: ["3.0", "3.1", "3.2", "3.3"]
     steps:
     - name: Check out code
-      uses: actions/checkout@v4
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up Ruby ${{ matrix.ruby }}
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true

data/.github/workflows/release.yml

@@ -0,0 +1,26 @@
+name: Release
+
+on: workflow_dispatch
+
+jobs:
+  release:
+    permissions:
+      contents: write
+      id-token: write
+
+    environment: release
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+    - name: Install required packages
+      run: |
+        sudo apt-get update
+        sudo apt-get -y install libmemcached-dev libmysqlclient-dev libpq-dev libsasl2-dev
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+      with:
+        bundler-cache: true
+        ruby-version: 3.3
+    - uses: rubygems/release-gem@052cc82692552de3ef2b81fd670e41d13cba8092 # v1.4.0

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/.ruby-version

@@ -0,0 +1 @@
+3.3.0

data/CHANGELOG.md

@@ -0,0 +1,16 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.2.7] - 2026-08-26
+
+### Fixed
+
+- It was possible that the gem wouldn't rescue a unique constraint violation error in
+  the even that a non unique index name would match a subset of the unique index
+  to rescue.

data/Gemfile.lock

@@ -0,0 +1,100 @@
+PATH
+  remote: .
+  specs:
+    activerecord-rescue_from_duplicate (0.2.7)
+      activerecord (>= 7)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (7.1.5.2)
+      activesupport (= 7.1.5.2)
+    activerecord (7.1.5.2)
+      activemodel (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
+      timeout (>= 0.4.0)
+    activesupport (7.1.5.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      mutex_m
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
+    diff-lcs (1.5.1)
+    docile (1.4.0)
+    drb (2.2.3)
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
+    logger (1.7.0)
+    method_source (1.0.0)
+    minitest (5.25.5)
+    mutex_m (0.3.0)
+    mysql2 (0.5.6)
+    pg (1.5.6)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (13.2.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    securerandom (0.3.2)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    sqlite3 (1.7.3-aarch64-linux)
+    sqlite3 (1.7.3-arm-linux)
+    sqlite3 (1.7.3-arm64-darwin)
+    sqlite3 (1.7.3-x86-linux)
+    sqlite3 (1.7.3-x86_64-darwin)
+    sqlite3 (1.7.3-x86_64-linux)
+    timeout (0.4.3)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  aarch64-linux
+  arm-linux
+  arm64-darwin
+  x86-linux
+  x86_64-darwin
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord-rescue_from_duplicate!
+  bundler
+  mysql2
+  pg
+  pry
+  rake
+  rspec
+  simplecov
+  sqlite3
+
+BUNDLED WITH
+   2.5.3

data/activerecord-rescue_from_duplicate.gemspec

@@ -13,6 +13,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/Shopify/activerecord-rescue_from_duplicate"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = ">= 3.0"
+
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})

data/lib/rescue_from_duplicate/active_record/extension.rb

@@ -2,6 +2,8 @@ require 'active_support/core_ext/class'
 
 module RescueFromDuplicate::ActiveRecord
   module Extension
+    DUPLICATE_KEY_REGEX = /for key ['"](?<key>[^'"]+)['"]/
+
     extend ActiveSupport::Concern
 
     module ClassMethods
@@ -80,8 +82,15 @@ module RescueFromDuplicate::ActiveRecord
     end
 
     def other_exception_columns(exception)
+      key = exception.message[DUPLICATE_KEY_REGEX, :key]
+      return [] unless key
+
+      # Mysql > 8.0 prefixes indexes with the table name.
+      index_name = key.delete_prefix("#{self.class.table_name}.")
+
       indexes = self.class.connection.schema_cache.indexes(self.class.table_name)
-      indexes.detect{ |i| exception.message.include?(i.name) }.try(:columns) || []
+      index = indexes.find { |i| i.name == index_name }
+      index ? index.columns : []
     end
   end
 end

data/lib/rescue_from_duplicate/active_record/version.rb

@@ -1,5 +1,5 @@
 module Activerecord
   module RescueFromDuplicate
-    VERSION = '0.2.6'
+    VERSION = '0.2.7'
   end
 end

data/spec/other_exception_columns_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+module RescueFromDuplicate
+  describe "#other_exception_columns (MySQL/MariaDB duplicate-key parsing)" do
+    let(:prefix_index) do
+      ::ActiveRecord::ConnectionAdapters::IndexDefinition.new(
+        "order_transactions", "index_order_transactions_on_shop_id", false, ["shop_id"]
+      )
+    end
+    let(:unique_index) do
+      ::ActiveRecord::ConnectionAdapters::IndexDefinition.new(
+        "order_transactions", "index_order_transactions_on_shop_id_and_unique_token", true, ["shop_id", "unique_token"]
+      )
+    end
+
+    let(:model) do
+      indexes = [prefix_index, unique_index]
+      connection = double(schema_cache: double(indexes: indexes))
+      Class.new do
+        include RescueFromDuplicate::ActiveRecord::Extension
+        define_singleton_method(:table_name) { "order_transactions" }
+        define_singleton_method(:connection) { connection }
+      end
+    end
+
+    subject(:columns) { model.allocate.send(:other_exception_columns, exception) }
+
+    context "with a MySQL 8.0+ table-qualified key name" do
+      let(:exception) do
+        ::ActiveRecord::RecordNotUnique.new(
+          "Duplicate entry '1-abc' for key 'order_transactions.index_order_transactions_on_shop_id_and_unique_token'"
+        )
+      end
+
+      it "selects the violated index regardless of ordering" do
+        expect(columns).to eq ["shop_id", "unique_token"]
+      end
+    end
+
+    context "with a MySQL 5.7 / MariaDB bare key name" do
+      let(:exception) do
+        ::ActiveRecord::RecordNotUnique.new(
+          "Duplicate entry '1-abc' for key 'index_order_transactions_on_shop_id_and_unique_token'"
+        )
+      end
+
+      it "selects the violated index by exact name" do
+        expect(columns).to eq ["shop_id", "unique_token"]
+      end
+    end
+
+    context "when the message carries no key name" do
+      let(:exception) { ::ActiveRecord::RecordNotUnique.new("some unrelated error") }
+
+      it "returns no columns" do
+        expect(columns).to eq []
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-rescue_from_duplicate
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Guillaume Malette
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-14 00:00:00.000000000 Z
+date: 2026-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -143,11 +143,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".github/workflows/cla.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
+- CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -161,6 +166,7 @@ files:
 - lib/rescue_from_duplicate/rescuer.rb
 - lib/rescue_from_duplicate/uniqueness_rescuer.rb
 - shipit.rubygems.yml
+- spec/other_exception_columns_spec.rb
 - spec/rescue_from_duplicate_spec.rb
 - spec/rescuer_spec.rb
 - spec/spec_helper.rb
@@ -172,7 +178,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -180,19 +186,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Rescue from MySQL and Sqlite duplicate errors when trying to insert records
   that fail uniqueness validation
 test_files:
+- spec/other_exception_columns_spec.rb
 - spec/rescue_from_duplicate_spec.rb
 - spec/rescuer_spec.rb
 - spec/spec_helper.rb