transaction_retry_continued 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: f41000c855c9718808af7de74dc4acc436d76618af8b026d38b797713e7de025
+  data.tar.gz: 51ee0b37da0f5cf18af574ed42e7214f54a1198200b562bd2bb97f7a5af2cb5c
+SHA512:
+  metadata.gz: 82d5871454e5541cf21988354f6e7dbe0a70c40bc789f61e286998617ba7bfffdebd6b52d5fab53a5d175d497d3b4148664e86d68462cc3f76bfcd584c31dc29
+  data.tar.gz: eee89ab0eaa1374b3e9d0d85554c4c8b702cfdd1fae55c6363ea6149f5150f8506f0ac059d849b53fc53c00c6fc5139bfba5c4bfaff05f33366d0e7d3069382a

data/.github/workflows/main.yml

@@ -0,0 +1,177 @@
+name: CI PR Builds
+'on':
+  push:
+    branches:
+      - master
+  pull_request:
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '2.5'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - '3.2'
+          - '3.3'
+        activerecord:
+          - '5.2'
+          - '6.0'
+          - '6.1'
+          - '7.0'
+        db:
+          - mysql2
+          - sqlite3
+          - skip
+        dbversion:
+          - skip
+        exclude:
+          - ruby: '3.0'
+            activerecord: '5.2'
+          - ruby: '3.1'
+            activerecord: '5.2'
+          - ruby: '3.2'
+            activerecord: '5.2'
+          - ruby: '3.3'
+            activerecord: '5.2'
+          - ruby: '2.5'
+            activerecord: '7.0'
+          - db: skip
+            dbversion: skip
+        include:
+          - ruby: '2.5'
+            activerecord: '5.2'
+            db: postgresql
+            dbversion: '9.6'
+          - ruby: '2.5'
+            activerecord: '6.0'
+            db: postgresql
+            dbversion: '9.6'
+          - ruby: '2.5'
+            activerecord: '6.1'
+            db: postgresql
+            dbversion: '9.6'
+          - ruby: '2.7'
+            activerecord: '5.2'
+            db: postgresql
+            dbversion: '9.6'
+          - ruby: '2.7'
+            activerecord: '6.0'
+            db: postgresql
+            dbversion: '9.6'
+          - ruby: '2.7'
+            activerecord: '6.1'
+            db: postgresql
+            dbversion: '9.6'
+          - ruby: '2.7'
+            activerecord: '7.0'
+            db: postgresql
+            dbversion: '9.6'
+          - ruby: '3.0'
+            activerecord: '6.0'
+            db: postgresql
+            dbversion: '9.6'
+          - ruby: '3.0'
+            activerecord: '6.1'
+            db: postgresql
+            dbversion: '9.6'
+          - ruby: '3.0'
+            activerecord: '7.0'
+            db: postgresql
+            dbversion: '9.6'
+          - ruby: '3.1'
+            activerecord: '6.0'
+            db: postgresql
+            dbversion: '9.6'
+          - ruby: '3.1'
+            activerecord: '6.1'
+            db: postgresql
+            dbversion: '9.6'
+          - ruby: '3.1'
+            activerecord: '7.0'
+            db: postgresql
+            dbversion: '9.6'
+    env:
+      BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/activerecord-${{ matrix.activerecord }}/Gemfile.${{ matrix.db }}"
+      MYSQL_DB_HOST: 127.0.0.1
+      MYSQL_DB_USER: root
+      MYSQL_DB_PASS: database
+      MYSQL_DB_NAME: transaction_retry_continued_test
+      POSTGRESQL_DB_HOST: 127.0.0.1
+      POSTGRESQL_DB_USER: transaction_retry_continued
+      POSTGRESQL_DB_PASS: database
+      POSTGRESQL_DB_NAME: transaction_retry_continued_test
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "${{ matrix.ruby }}"
+          bundler-cache: true
+      - name: Run bundle update
+        run: bundle update
+      - name: Start Mysql
+        if: matrix.db == 'mysql2'
+        run: |
+          docker run --rm --detach \
+            -e MYSQL_ROOT_PASSWORD=$MYSQL_DB_PASS \
+            -e MYSQL_DATABASE=transaction_retry_continued_test \
+            -p 3306:3306 \
+            --health-cmd "mysqladmin ping --host=127.0.0.1 --password=$MYSQL_DB_PASS --silent" \
+            --health-interval 5s \
+            --health-timeout 5s \
+            --health-retries 5 \
+            --name database mysql:5.6
+      - name: Start Postgresql
+        if: matrix.db == 'postgresql'
+        run: |
+          docker run --rm --detach \
+            -e POSTGRES_USER=$POSTGRESQL_DB_USER \
+            -e POSTGRES_PASSWORD=$POSTGRESQL_DB_PASS \
+            -e POSTGRES_DB=transaction_retry_continued_test \
+            -p 5432:5432 \
+            --health-cmd "pg_isready -q" \
+            --health-interval 5s \
+            --health-timeout 5s \
+            --health-retries 5 \
+            --name database postgres:${{ matrix.dbversion }}
+      - name: Wait for database to start
+        if: "(matrix.db == 'postgresql' || matrix.db == 'mysql2')"
+        run: |
+          COUNT=0
+          ATTEMPTS=20
+          until [[ $COUNT -eq $ATTEMPTS ]]; do
+            [ "$(docker inspect -f {{.State.Health.Status}} database)" == "healthy" ] && break
+            echo $(( COUNT++ )) > /dev/null
+            sleep 2
+          done
+      - name: test
+        run: echo $BUNDLE_GEMFILE
+      - name: Run tests
+        run: db=${{ matrix.db }} bundle exec rake test
+      - name: Shutdown database
+        if: always() && (matrix.db == 'postgresql' || matrix.db == 'mysql2')
+        run: docker stop database
+#      - name: Coveralls Parallel
+#        if: "${{ !env.ACT }}"
+#        uses: coverallsapp/github-action@master
+#        with:
+#          github-token: "${{ secrets.GITHUB_TOKEN }}"
+#          flag-name: run-${{ matrix.ruby }}-${{ matrix.activerecord }}-${{ matrix.db }}-${{ matrix.dbversion }}
+#          parallel: true
+#  finish:
+#    needs: test
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Coveralls Finished
+#        if: "${{ !env.ACT }}"
+#        uses: coverallsapp/github-action@master
+#        with:
+#          github-token: "${{ secrets.GITHUB_TOKEN }}"
+#          parallel-finished: true

data/.gitignore

@@ -0,0 +1,6 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*
+.idea
+test/log/*.log

data/Gemfile

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+source "http://rubygems.org"
+
+gemspec
+
+gemfile_local = File.expand_path '../Gemfile.local', __FILE__
+eval File.read(gemfile_local), binding, gemfile_local if File.exist? gemfile_local
+#
+# group :test do
+#   gem 'transaction_isolation', git: 'https://github.com/alittlebit/transaction_isolation'
+#   # Use the gem instead of a dated version bundled with Ruby
+#   gem 'minitest', '5.3.4'
+#   gem 'simplecov', :require => false
+# end
+#
+# group :development do
+#   gem 'transaction_isolation', git: 'https://github.com/alittlebit/transaction_isolation'
+#   gem 'rake'
+#   # enhance irb
+#   gem 'awesome_print', :require => false
+#   gem 'pry', :require => false
+# end

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (C) 2012 Piotr 'Qertoip' Włodarek
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -0,0 +1,107 @@
+# Transaction Retry Continued
+
+> This is a community-driven continuation of the [`transaction_retry`](https://github.com/qertoip/transaction_retry) gem
+for retrying database transactions on deadlock and serialization errors. Originally designed to support MySQL,
+PostgreSQL, and SQLite databases.
+
+The `transaction_retry` gem enhances transaction reliability by automatically retrying transactions upon encountering
+deadlock and serialization errors in the database.
+
+## Installation
+
+Add this line to your application's `Gemfile`:
+
+```ruby
+gem 'transaction_retry_continued'
+```
+
+And then execute:
+
+```bash
+bundle install
+```
+
+## Usage
+
+The gem simplifies transaction retry logic by automatically rescuing `ActiveRecord::TransactionIsolationConflict` and
+retrying the transaction.
+
+__It works out of the box with Ruby on Rails__.
+
+If you have a standalone ActiveRecord-based project you'll need to call:
+
+```ruby
+    TransactionRetry.apply_activerecord_patch     # after connecting to the database
+```
+
+## Database deadlock and serialization errors that are retried
+
+#### MySQL
+
+ * Deadlock found when trying to get lock
+ * Lock wait timeout exceeded
+
+#### PostgreSQL
+
+ * deadlock detected
+ * could not serialize access
+
+#### SQLite
+
+ * The database file is locked
+ * A table in the database is locked
+ * Database lock protocol error
+
+## Configuration
+
+You can optionally configure transaction_retry gem in your config/initializers/transaction_retry.rb (or anywhere else):
+
+```ruby
+  TransactionRetry.max_retries = 3
+  TransactionRetry.wait_times = [0, 1, 2, 4, 8, 16, 32]   # seconds to sleep after retry n
+```
+
+## Features
+
+ * Supports MySQL, PostgreSQL, and SQLite (as long as you are using new drivers mysql2, pg, sqlite3).
+ * Exponential sleep times between retries (0, 1, 2, 4 seconds).
+ * Logs every retry as a warning.
+ * Intentionally does not retry nested transactions.
+ * Configurable number of retries and sleep time between them.
+ * Use it in your Rails application or a standalone ActiveRecord-based project.
+
+## Testimonials
+
+This gem was initially developed for and successfully works in production at [Kontomierz.pl](http://kontomierz.pl) - the finest Polish personal finance app.
+
+## Compatibility
+
+ * Ruby 2.5, 2.6, 2.7, 3.0, 3.1, 3.2, 3.3
+ * ActiveRecord 5.2, 6.0, 6.1, 7.0
+
+## Running tests
+
+Run tests on the selected database (mysql2 by default):
+
+    db=mysql2 bundle exec rake test
+    db=postgresql bundle exec rake test
+    db=sqlite3 bundle exec rake test
+
+Run tests on all supported databases:
+
+    ./tests
+
+Database configuration is hardcoded in test/db/db.rb; feel free to improve this and submit a pull request.
+
+## How intrusive is this gem?
+
+You should be very suspicious about any gem that monkey patches your stock Ruby on Rails framework.
+
+This gem is carefully written to not be more intrusive than it needs to be:
+
+ * wraps ActiveRecord::Base#transaction class method using alias_method to add new behaviour
+ * introduces two new private class methods in ActiveRecord::Base (with names that should never collide)
+
+## License
+
+Released under the MIT license. Copyright (C) 2012 Piotr 'Qertoip' Włodarek.

data/Rakefile

@@ -0,0 +1,11 @@
+require "bundler/gem_tasks"
+
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs += ["test", "lib"]
+  t.pattern = 'test/integration/**/*_test.rb'
+  t.verbose = true
+end
+
+task :default => [:test]

data/d

@@ -0,0 +1 @@
+bundle exec ruby test/test_console.rb

data/gemfiles/Gemfile.base

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec path: Dir.getwd
+
+gem 'transaction_isolation', git: 'https://github.com/iagopiimenta/transaction_isolation_continued', branch: 'setup-git-workflow'
+
+File.exist?(gemfile_local = File.expand_path('./Gemfile.local', Dir.getwd)) and eval File.read(gemfile_local), binding, gemfile_local

data/gemfiles/activerecord-5.2/Gemfile.base

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 5.2.0.beta0", "< 5.3"

data/gemfiles/activerecord-5.2/Gemfile.mysql2

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-5.2/Gemfile.postgresql

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-5.2/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "sqlite3", "~> 1.4"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/gemfiles/activerecord-6.0/Gemfile.base

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 6.0", "< 6.1"

data/gemfiles/activerecord-6.0/Gemfile.mysql2

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-6.0/Gemfile.postgresql

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-6.0/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "sqlite3", "~> 1.4"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/gemfiles/activerecord-6.1/Gemfile.base

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 6.1", "< 6.2"

data/gemfiles/activerecord-6.1/Gemfile.mysql2

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-6.1/Gemfile.postgresql

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-6.1/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "sqlite3", "~> 1.4"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/gemfiles/activerecord-7.0/Gemfile.base

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 7.0", "< 7.1"

data/gemfiles/activerecord-7.0/Gemfile.mysql2

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-7.0/Gemfile.postgresql

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-7.0/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "sqlite3", "~> 1.4"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/lib/transaction_retry/active_record/base.rb

@@ -0,0 +1,82 @@
+require 'active_record/base'
+
+module TransactionRetry
+  module ActiveRecord
+    module Base
+
+      def self.included( base )
+        base.extend( ClassMethods )
+        base.class_eval do
+          class << self
+            alias_method :transaction_without_retry, :transaction
+            alias_method :transaction, :transaction_with_retry
+          end
+        end
+      end
+      
+      module ClassMethods
+        
+        def transaction_with_retry(**objects, &block)
+          retry_count = 0
+
+          opts = if objects.is_a? Hash
+            objects
+          else
+            {}
+          end
+
+          retry_on = opts.delete(:retry_on)
+          max_retries = opts.delete(:max_retries) || TransactionRetry.max_retries
+
+          begin
+            transaction_without_retry(**objects, &block)
+          rescue *[::ActiveRecord::TransactionIsolationConflict, *retry_on]
+            raise if retry_count >= max_retries
+            raise if tr_in_nested_transaction?
+            
+            retry_count += 1
+            postfix = { 1 => 'st', 2 => 'nd', 3 => 'rd' }[retry_count] || 'th'
+
+            type_s = case $!
+            when ::ActiveRecord::TransactionIsolationConflict
+              "Transaction isolation conflict"
+            else
+              $!.class.name
+            end
+
+            logger.warn "#{type_s} detected. Retrying for the #{retry_count}-#{postfix} time..." if logger
+            tr_exponential_pause( retry_count )
+            retry
+          end
+        end
+        
+        private
+
+          # Sleep 0, 1, 2, 4, ... seconds up to the TransactionRetry.max_retries.
+          # Cap the sleep time at 32 seconds.
+          # An ugly tr_ prefix is used to minimize the risk of method clash in the future.
+          def tr_exponential_pause( count )
+            seconds = TransactionRetry.wait_times[count-1] || 32
+
+            if TransactionRetry.fuzz
+              fuzz_factor = [seconds * 0.25, 1].max
+
+              seconds += rand * (fuzz_factor * 2) - fuzz_factor
+            end
+
+            sleep( seconds ) if seconds > 0
+          end
+        
+          # Returns true if we are in the nested transaction (the one with :requires_new => true).
+          # Returns false otherwise.
+          # An ugly tr_ prefix is used to minimize the risk of method clash in the future.
+          def tr_in_nested_transaction?
+            connection.open_transactions != 0
+          end
+
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send( :include, TransactionRetry::ActiveRecord::Base )

data/lib/transaction_retry/version.rb

@@ -0,0 +1,3 @@
+module TransactionRetry
+  VERSION = "1.1.0"
+end

data/lib/transaction_retry.rb

@@ -0,0 +1,49 @@
+require "active_record"
+require "transaction_isolation"
+
+require_relative "transaction_retry/version"
+
+module TransactionRetry
+
+  # Must be called after ActiveRecord established a connection.
+  # Only then we know which connection adapter is actually loaded and can be enhanced.
+  # Please note ActiveRecord does not load unused adapters.
+  def self.apply_activerecord_patch
+    TransactionIsolation.apply_activerecord_patch
+    require_relative 'transaction_retry/active_record/base'
+  end
+
+  if defined?( ::Rails )
+    # Setup applying the patch after Rails is initialized.
+    class Railtie < ::Rails::Railtie
+      config.after_initialize do
+        TransactionRetry.apply_activerecord_patch
+      end
+    end
+  end
+
+  def self.max_retries
+    @@max_retries ||= 3
+  end
+
+  def self.max_retries=( n )
+    @@max_retries = n
+  end
+
+  def self.wait_times
+    @@wait_times ||= [0, 1, 2, 4, 8, 16, 32]
+  end
+
+  def self.wait_times=( array_of_seconds )
+    @@wait_times = array_of_seconds
+  end
+
+  def self.fuzz
+    @@fuzz ||= true
+  end
+
+  def self.fuzz=( val )
+    @@fuzz = val
+  end
+
+end

data/lib/transaction_retry_continued.rb

@@ -0,0 +1 @@
+require 'transaction_retry'

data/test/db/all.rb

@@ -0,0 +1,4 @@
+require 'active_record'
+require_relative 'db'
+require_relative 'migrations'
+require_relative 'queued_job'

data/test/db/db.rb

@@ -0,0 +1,37 @@
+require 'fileutils'
+
+module TransactionRetry
+  module Test
+    module Db
+
+      def self.connect_to_mysql2
+        ::ActiveRecord::Base.establish_connection(
+          :adapter => "mysql2",
+          :database => ENV['MYSQL_DB_NAME'],
+          :host => ENV['MYSQL_DB_HOST'],
+          :user => 'root',
+          :password => ENV['MYSQL_DB_PASS']
+        )
+      end
+
+      def self.connect_to_postgresql
+        ::ActiveRecord::Base.establish_connection(
+          :adapter => "postgresql",
+          :database => ENV['POSTGRESQL_DB_NAME'],
+          :host => ENV['POSTGRESQL_DB_HOST'],
+          :user => ENV['POSTGRESQL_DB_USER'],
+          :password => ENV['POSTGRESQL_DB_PASS']
+        )
+      end
+
+      def self.connect_to_sqlite3
+        ActiveRecord::Base.establish_connection(
+          :adapter => "sqlite3",
+          :database => ":memory:",
+          :verbosity => "silent"
+        )
+      end
+
+    end
+  end
+end

data/test/db/migrations.rb

@@ -0,0 +1,20 @@
+module TransactionRetry
+  module Test
+    module Migrations
+
+      def self.run!
+        c = ::ActiveRecord::Base.connection
+
+        # Queued Jobs
+        
+        c.create_table "queued_jobs", :force => true do |t|
+          t.text     "job",                               :null => false
+          t.integer  "status",     :default => 0,         :null => false
+          t.timestamps
+        end
+
+      end
+
+    end
+  end
+end

data/test/db/queued_job.rb

@@ -0,0 +1,2 @@
+class QueuedJob < ActiveRecord::Base
+end

data/test/integration/active_record/base/transaction_with_retry_test.rb

@@ -0,0 +1,135 @@
+# -*- encoding : utf-8 -*-
+
+require 'test_helper'
+
+class TransactionWithRetryTest < MiniTest::Unit::TestCase
+  class CustomError < StandardError
+  end
+
+  def setup
+    @original_max_retries = TransactionRetry.max_retries
+    @original_wait_times = TransactionRetry.wait_times
+  end
+
+  def teardown
+    TransactionRetry.max_retries = @original_max_retries
+    TransactionRetry.wait_times = @original_wait_times
+    QueuedJob.delete_all
+  end
+  
+  def test_does_not_break_transaction
+    ActiveRecord::Base.transaction do
+      QueuedJob.create!( :job => 'is fun!' )
+      assert_equal( 1, QueuedJob.count )
+    end
+    assert_equal( 1, QueuedJob.count )
+    QueuedJob.first.destroy
+  end
+
+  def test_does_not_break_transaction_rollback
+    ActiveRecord::Base.transaction do
+      QueuedJob.create!( :job => 'gives money!' )
+      raise ActiveRecord::Rollback
+    end
+    assert_equal( 0, QueuedJob.count )
+  end
+
+  def test_retries_transaction_on_transaction_isolation_conflict
+    first_run = true
+
+    ActiveRecord::Base.transaction do
+      if first_run
+        first_run = false
+        message = "Deadlock found when trying to get lock"
+        raise ActiveRecord::TransactionIsolationConflict.new( message )
+      end
+      QueuedJob.create!( :job => 'is cool!' )
+    end
+    assert_equal( 1, QueuedJob.count )
+    
+    QueuedJob.first.destroy
+  end
+
+  def test_does_not_retry_on_unknown_error
+    first_run = true
+
+    assert_raises( CustomError ) do
+      ActiveRecord::Base.transaction do
+        if first_run
+          first_run = false
+          message = "Deadlock found when trying to get lock"
+          raise CustomError, "random error"
+        end
+        QueuedJob.create!( :job => 'is cool!' )
+      end
+    end
+    assert_equal( 0, QueuedJob.count )
+  end
+
+  def test_retries_on_custom_error
+    first_run = true
+
+    ActiveRecord::Base.transaction(retry_on: CustomError) do
+      if first_run
+        first_run = false
+        message = "Deadlock found when trying to get lock"
+        raise CustomError, "random error"
+      end
+      QueuedJob.create!( :job => 'is cool!' )
+    end
+    assert_equal( 1, QueuedJob.count )
+    
+    QueuedJob.first.destroy
+  end
+
+  def test_does_not_retry_transaction_more_than_max_retries_times
+    TransactionRetry.max_retries = 1
+    run = 0
+
+    assert_raises( ActiveRecord::TransactionIsolationConflict ) do
+      ActiveRecord::Base.transaction do
+        run += 1
+        message = "Deadlock found when trying to get lock"
+        raise ActiveRecord::TransactionIsolationConflict.new( message )
+      end
+    end
+    
+    assert_equal( 2, run )  # normal run + one retry
+
+    TransactionRetry.max_retries = 3
+
+    run = 0
+
+    assert_raises( ActiveRecord::TransactionIsolationConflict ) do
+      ActiveRecord::Base.transaction(max_retries: 1) do
+        run += 1
+        message = "Deadlock found when trying to get lock"
+        raise ActiveRecord::TransactionIsolationConflict.new( message )
+      end
+    end
+    
+    assert_equal( 2, run )  # normal run + one retry
+  end
+
+  def test_does_not_retry_nested_transaction
+    first_try = true
+
+    ActiveRecord::Base.transaction do
+
+      assert_raises( ActiveRecord::TransactionIsolationConflict ) do
+        ActiveRecord::Base.transaction( :requires_new => true ) do
+          if first_try
+            first_try = false
+            message = "Deadlock found when trying to get lock"
+            raise ActiveRecord::TransactionIsolationConflict.new( message )
+          end
+          QueuedJob.create!( :job => 'is cool!' )
+        end
+      end
+      
+    end
+      
+    assert_equal( 0, QueuedJob.count )
+  end
+
+end

data/test/library_setup.rb

@@ -0,0 +1,25 @@
+# Prepares application to be tested (requires files, connects to db, resets schema and data, applies patches, etc.)
+
+# Initialize database
+require 'db/all'
+
+case ENV['db']
+  when 'mysql2'
+    TransactionRetry::Test::Db.connect_to_mysql2
+  when 'postgresql'
+    TransactionRetry::Test::Db.connect_to_postgresql
+  when 'sqlite3'
+    TransactionRetry::Test::Db.connect_to_sqlite3
+  else
+    TransactionRetry::Test::Db.connect_to_mysql2
+end
+
+require 'logger'
+ActiveRecord::Base.logger = Logger.new( File.expand_path( "#{File.dirname( __FILE__ )}/log/test.log" ) )
+
+TransactionRetry::Test::Migrations.run!
+
+# Load the code that will be tested
+require 'transaction_retry'
+
+TransactionRetry.apply_activerecord_patch

data/test/test_console.rb

@@ -0,0 +1,11 @@
+# Ensure that LOAD_PATH is the same as when running "rake test"; normally rake takes care of that
+$LOAD_PATH << File.expand_path( ".", File.dirname( __FILE__ ) )
+$LOAD_PATH << File.expand_path( "./lib", File.dirname( __FILE__ ) )
+$LOAD_PATH << File.expand_path( "./test", File.dirname( __FILE__ ) )
+
+# Boot the app
+require_relative 'library_setup'
+
+# Fire the console
+require 'pry'
+binding.pry

data/test/test_helper.rb

@@ -0,0 +1,12 @@
+# Load test coverage tool (must be loaded before any code)
+#require 'simplecov'
+#SimpleCov.start do
+#  add_filter '/test/'
+#  add_filter '/config/'
+#end
+
+# Load and initialize the application to be tested
+require 'library_setup'
+
+# Load test frameworks
+require 'minitest/autorun'

data/test/test_runner.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+# Load all tests
+Dir.glob( "./**/*_test.rb" ).each { |test_file| require test_file }

data/tests

@@ -0,0 +1,6 @@
+
+db=mysql2 bundle exec rake
+
+db=postgresql bundle exec rake
+
+db=sqlite3 bundle exec rake

data/transaction_retry_continued.gemspec

@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "transaction_retry/version"
+
+Gem::Specification.new do |s|
+  s.name        = "transaction_retry_continued"
+  s.version     = TransactionRetry::VERSION
+  s.authors     = ["Iago Pimenta"]
+  s.homepage    = "https://github.com/iagopiimenta/transaction_retry_continued"
+  s.summary     = %q{Retries database transaction on deadlock and transaction serialization errors. Supports MySQL, PostgreSQL and SQLite.}
+  s.description = %q{Retries database transaction on deadlock and transaction serialization errors. Supports MySQL, PostgreSQL and SQLite.}
+  s.required_ruby_version = '>= 2.5'
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_development_dependency 'rake', '~> 13.0'
+  s.add_development_dependency 'minitest', '5.3.4'
+  s.add_runtime_dependency "activerecord", ">= 5.2"
+  s.add_runtime_dependency "transaction_isolation_continued", ">= 1.0"
+end

metadata

@@ -0,0 +1,149 @@
+--- !ruby/object:Gem::Specification
+name: transaction_retry_continued
+version: !ruby/object:Gem::Version
+  version: 1.1.0
+platform: ruby
+authors:
+- Iago Pimenta
+autorequire:
+bindir: bin
+cert_chain: []
+date: 2024-05-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.3.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.3.4
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: transaction_isolation_continued
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+description: Retries database transaction on deadlock and transaction serialization
+  errors. Supports MySQL, PostgreSQL and SQLite.
+email:
+executables: []
+extensions: []
+extra_rdoc_files: []
+files:
+- ".github/workflows/main.yml"
+- ".gitignore"
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- d
+- gemfiles/Gemfile.base
+- gemfiles/activerecord-5.2/Gemfile.base
+- gemfiles/activerecord-5.2/Gemfile.mysql2
+- gemfiles/activerecord-5.2/Gemfile.postgresql
+- gemfiles/activerecord-5.2/Gemfile.sqlite3
+- gemfiles/activerecord-6.0/Gemfile.base
+- gemfiles/activerecord-6.0/Gemfile.mysql2
+- gemfiles/activerecord-6.0/Gemfile.postgresql
+- gemfiles/activerecord-6.0/Gemfile.sqlite3
+- gemfiles/activerecord-6.1/Gemfile.base
+- gemfiles/activerecord-6.1/Gemfile.mysql2
+- gemfiles/activerecord-6.1/Gemfile.postgresql
+- gemfiles/activerecord-6.1/Gemfile.sqlite3
+- gemfiles/activerecord-7.0/Gemfile.base
+- gemfiles/activerecord-7.0/Gemfile.mysql2
+- gemfiles/activerecord-7.0/Gemfile.postgresql
+- gemfiles/activerecord-7.0/Gemfile.sqlite3
+- lib/transaction_retry.rb
+- lib/transaction_retry/active_record/base.rb
+- lib/transaction_retry/version.rb
+- lib/transaction_retry_continued.rb
+- test/db/all.rb
+- test/db/db.rb
+- test/db/migrations.rb
+- test/db/queued_job.rb
+- test/integration/active_record/base/transaction_with_retry_test.rb
+- test/library_setup.rb
+- test/log/.gitkeep
+- test/test_console.rb
+- test/test_helper.rb
+- test/test_runner.rb
+- tests
+- transaction_retry_continued.gemspec
+homepage: https://github.com/iagopiimenta/transaction_retry_continued
+licenses: []
+metadata: {}
+post_install_message:
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '2.5'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubygems_version: 3.4.13
+signing_key:
+specification_version: 4
+summary: Retries database transaction on deadlock and transaction serialization errors.
+  Supports MySQL, PostgreSQL and SQLite.
+test_files:
+- test/db/all.rb
+- test/db/db.rb
+- test/db/migrations.rb
+- test/db/queued_job.rb
+- test/integration/active_record/base/transaction_with_retry_test.rb
+- test/library_setup.rb
+- test/log/.gitkeep
+- test/test_console.rb
+- test/test_helper.rb
+- test/test_runner.rb