activerecord-rescue_from_duplicate 0.1.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 998e5fbd4ae44c14022a24a43b6501e37ebeaa4fae22d5ae98b150bb286c8013
-  data.tar.gz: a9aff249013923879e7e2e9a746a16d32851d15c5b9eb327113b3f1926905e1f
+  metadata.gz: 00a9576198c85da3503fc44c7420dd287082a3a8219fe716cd88340ab8da432d
+  data.tar.gz: 196bb9b82c0d333e4fdbaf254992f9e2cf997d62d171420bff1859bdf4d1aca8
 SHA512:
-  metadata.gz: a61214eaacecb66b6aa8088a590ea9f944207ad2578868df5b29d517bc8abf61992b630ef8a28854d591a30409e99bccad6ecc3672936601a829b9fde1cb78ff
-  data.tar.gz: c0fbac267cb75a708a3dcd5a798e14861b6ff332826ef6d51bca73a2979bd5d1331679def180e8cde1c3be4839584ec7a454adbcb7f399345a32d5ba81a33393
+  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

@@ -0,0 +1,42 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Ruby ${{ matrix.ruby }}
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: "test"
+          POSTGRES_PASSWORD: "test"
+          POSTGRES_DB: "rescue_from_duplicate"
+        ports:
+          - "5432:5432"
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_USER: "test"
+          MYSQL_PASSWORD: "test"
+          MYSQL_ALLOW_EMPTY_PASSWORD: "true"
+          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.0", "3.1", "3.2", "3.3"]
+    steps:
+    - name: Check out code
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - name: Set up Ruby ${{ matrix.ruby }}
+      uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+        cache-version: 1
+    - name: Tests
+      run: bundle exec rake

data/.github/workflows/cla.yml

@@ -0,0 +1,24 @@
+# .github/workflows/cla.yml
+name: Contributor License Agreement (CLA)
+
+on:
+  pull_request_target:
+    types: [opened, synchronize]
+  issue_comment:
+    types: [created]
+
+jobs:
+  cla:
+    runs-on: ubuntu-latest
+    if: |
+      (github.event.issue.pull_request
+        && !github.event.issue.pull_request.merged_at
+        && contains(github.event.comment.body, 'signed')
+      )
+      || (github.event.pull_request && !github.event.pull_request.merged)
+    steps:
+      - uses: Shopify/shopify-cla-action@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          cla-token: ${{ secrets.CLA_TOKEN }}
+

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/README.md

@@ -10,8 +10,6 @@ Additionally, a macro allows you to assume that the record will be unique and re
 
 Tested with:
 
-- ActiveRecord: 3.2, 4.0, 4.1, 4.2, edge
-- Ruby 1.9.3, 2.0.0, 2.1.2
 - MySQL, PostgreSQL, Sqlite3
 
 **Note:**
@@ -69,7 +67,7 @@ And then execute:
 Or install it yourself as:
 
     $ gem install activerecord-rescue_from_duplicate
-    
+
 ## Development Setup
 
 Install:

data/activerecord-rescue_from_duplicate.gemspec

@@ -13,12 +13,14 @@ 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)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 5.2"
+  spec.add_dependency "activerecord", ">= 7"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

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
@@ -43,11 +45,14 @@ module RescueFromDuplicate::ActiveRecord
     end
 
     def exception_handler(exception)
+      handlers = self.class._rescue_from_duplicate_handlers
+      return if handlers.empty?
+
       columns = exception_columns(exception)
       return unless columns
       columns = columns.sort
 
-      self.class._rescue_from_duplicate_handlers.detect do |handler|
+      handlers.detect do |handler|
         handler.rescue? && columns == handler.columns
       end
     end
@@ -67,7 +72,7 @@ module RescueFromDuplicate::ActiveRecord
     end
 
     def sqlite3_exception_columns(exception)
-      extract_columns(exception.message[/columns? (.*) (?:is|are) not unique/, 1]) || 
+      extract_columns(exception.message[/columns? (.*) (?:is|are) not unique/, 1]) ||
       extract_columns(exception.message[/UNIQUE constraint failed: ([^:]*)\:?/, 1])
     end
 
@@ -77,8 +82,15 @@ module RescueFromDuplicate::ActiveRecord
     end
 
     def other_exception_columns(exception)
-      indexes = self.class.connection.indexes(self.class.table_name)
-      indexes.detect{ |i| exception.message.include?(i.name) }.try(:columns) || []
+      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)
+      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.1.6'
+    VERSION = '0.2.7'
   end
 end

data/lib/rescue_from_duplicate/active_record.rb

@@ -16,7 +16,7 @@ module RescueFromDuplicate
     klasses.each do |klass|
       klass._rescue_from_duplicate_handlers.each do |handler|
         next unless klass.connection.table_exists?(klass.table_name)
-        unique_indexes = klass.connection.indexes(klass.table_name).select(&:unique)
+        unique_indexes = klass.connection.schema_cache.indexes(klass.table_name).select(&:unique)
 
         unless unique_indexes.any? { |index| index.columns.map(&:to_s).sort == handler.columns }
           missing_unique_indexes << MissingUniqueIndex.new(klass, handler.attributes, handler.columns)

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

data/spec/rescue_from_duplicate_spec.rb

@@ -7,7 +7,8 @@ shared_examples 'database error rescuing' do
   subject { Rescuable.new }
 
   before do
-    allow(Rescuable).to(receive(:connection).and_return(double(indexes: [Rescuable.index])))
+    connection = double(schema_cache: double(indexes: [Rescuable.index]))
+    allow(Rescuable).to(receive(:connection).and_return(connection))
   end
 
   describe "#create_or_update when the validation fails" do
@@ -26,6 +27,13 @@ shared_examples 'database error rescuing' do
       it "raises an exception" do
         expect { subject.create_or_update }.to raise_error(ActiveRecord::RecordNotUnique)
       end
+
+      it "doesn't parse the message" do
+        allow(uniqueness_exception).to(
+          receive(:message).and_raise(StandardError, "Message should not have been accessed")
+        )
+        expect { subject.create_or_update }.to raise_error(ActiveRecord::RecordNotUnique)
+      end
     end
   end
 

data/spec/support/model.rb

@@ -13,7 +13,7 @@ CONNECTIONS = {
     username: "test",
     password: "test",
     host: "127.0.0.1",
-    port: "29292",
+    port: "5432",
   },
   test_mysql: {
     adapter: "mysql2",
@@ -21,7 +21,7 @@ CONNECTIONS = {
     username: "test",
     password: "test",
     host: "127.0.0.1",
-    port: "29291",
+    port: "3306",
   },
 }
 class CreateAllTables < ActiveRecord::Migration[5.2]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-rescue_from_duplicate
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Guillaume Malette
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2026-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -143,10 +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"
-- ".travis.yml"
+- ".ruby-version"
+- CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -160,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
@@ -171,7 +178,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -179,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.0.3
-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

data/.travis.yml

@@ -1,18 +0,0 @@
-sudo: false
-rvm:
-  - '2.5'
-  - '2.6'
-  - '2.7'
-
-env:
-  - DOCKER_COMPOSE_VERSION=1.20.1
-
-before_script:
-  - docker-compose --version
-  - docker-compose pull
-  - docker-compose build
-  - docker-compose up --no-start
-  - docker-compose start
-  - sleep 30 # Wait for databases to come online
-  - docker ps
-