trx_ext 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 489053db9c987c891db8ef10bc7ce8d513c49193c99b543a5d9610dc80cfe18b
-  data.tar.gz: a964c8bbf189217897b61237ac6be0fb8c35ba669efae9b65a24f7a5323a7789
+  metadata.gz: 0215abbca618956a55b181c88c6d1658ae5e12a0133f9797c0171b8b9f93e56e
+  data.tar.gz: 47c9e6c5158adf4ef735de356de2fa613394546a056dde43c1e252873271b790
 SHA512:
-  metadata.gz: b09b5eb4644c73a3717d27808b6d9fc7c570b9447a0cfb038952ed862ee240ff880d3650e9688482ea9084c28d429b86663a3e39f55950a179c9b870b33cec00
-  data.tar.gz: 74bcdd9e164756cfcdf97132a32d3c08d0cc19785261e4ae827a7f73732db504171494eb52bdea994848aaffa6b25675ba7a7395f76297ae9718e06f0b27cb24
+  metadata.gz: bd0d01be3aa27dff5752d91317101915db9e58ea1eb89adff6027bf43739328098d4dbd6c849be2f2c095f959fa2ded3c8d8338ee45e31931cc48f0066d641d2
+  data.tar.gz: f21e6e927d86119a2d08dab98dce1a9acf2ed528e0773a9241c3dde75f429b2f643612efc6d67494e9c3ceb4c5eaa075d78b83ea98fa5c25a6f396e1b461debb

data/Dockerfile

@@ -0,0 +1,3 @@
+FROM postgres:15.4
+
+RUN sed -i -e"s/^#default_transaction_isolation =.*$/default_transaction_isolation = 'serializable'/" /usr/share/postgresql/postgresql.conf.sample

data/Gemfile

@@ -8,5 +8,9 @@ gemspec
 gem "rake", "~> 13.0"
 
 if ENV['AR_VERSION']
-  gem 'activerecord', ENV['AR_VERSION']
+  # Given ENV['AR_VERSION'] to equal "6.0" will produce
+  # ```ruby
+  # gem 'activerecord', "~> 6.0", "< 6.1"
+  # ```
+  gem 'activerecord', "~> #{ENV['AR_VERSION']}", "< #{ENV['AR_VERSION'].next}"
 end

data/README.md

@@ -8,7 +8,7 @@ Currently, the implementation only works for ActiveRecord PostgreSQL adapter. Fe
 
 Because the implementation of this gem is a patch for `ActiveRecord::ConnectionAdapters::PostgreSQLAdapter` - carefully test its integration into your project. For example, if your project patches ActiveRecord or if some of your gems patches ActiveRecord - there might be conflicts in the implementation which could potentially lead to the data loss.
 
-Currently, the implementation is tested for `6.0.4.4`, `6.1.4.4` and `7.0.1` versions of ActiveRecord(see [TrxExt::SUPPORTED_AR_VERSIONS](lib/trx_ext/version.rb))
+Currently, the implementation is tested for rails v6+.
 
 ## Requirements
 
@@ -584,22 +584,13 @@ end
 ### Setup
 
   - After checking out the repo, run `bin/setup` to install dependencies.
-  - Setup postgresql server with `serializable` transaction isolation level - you have to set `default_transaction_isolation` config option to `serializable` in your `postgresql.conf` file
-  - Create pg user and a database. This database will be used to run tests. When running console, this database will be used as a default database to connect to. Example:
-    ```shell
-    sudo -u postgres createuser postgres --superuser
-    sudo -u postgres psql --command="CREATE DATABASE trx_ext_db OWNER postgres"    
-    ```
-  - Setup db connection settings. Copy config sample and edit it to match your created pg user and database:
-    ```shell
-    cp spec/support/config/database.yml.sample spec/support/config/database.yml  
-    ```
+  - run docker-compose using `docker-compose up` command - it starts necessary services 
     
 Now you can run `bin/console` for an interactive prompt that will allow you to experiment.
 
 ### Tests
 
-You can run tests for currently installed AR using `rspec` command. There is `bin/test_all_ar_versions` executable that allows you to run tests within all supported AR versions(see [TrxExt::SUPPORTED_AR_VERSIONS](lib/trx_ext/version.rb)) as well.
+You can run tests for currently installed AR using `rspec` command. There is `bin/test_all_ar_versions` executable that allows you to run tests within all supported AR versions.
 
 ### Other
 
@@ -616,7 +607,3 @@ The gem is available as open source under the terms of the [MIT License](https:/
 ## Code of Conduct
 
 Everyone interacting in the TrxExt project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/intale/trx_ext/blob/master/CODE_OF_CONDUCT.md).
-
-## TODO
-
-- integrate GitHub Actions

data/bin/console

@@ -21,9 +21,6 @@ require_relative '../spec/support/dummy_record'
 ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT)
 TrxExt.logger = ActiveSupport::Logger.new(STDOUT)
 
-if Config.db_config
-  ActiveRecord::Base.establish_connection(Config.db_config)
-  DummyRecord.setup
-end
+DummyRecord.setup
 
 IRB.start(__FILE__)

data/bin/test_all_ar_versions

@@ -2,9 +2,7 @@
 
 # frozen_string_literal: true
 
-require_relative '../lib/trx_ext/version'
-
-TrxExt::SUPPORTED_AR_VERSIONS.each do |ar_version|
+%w[6.0 6.1 7.0].each do |ar_version|
   `rm Gemfile.lock`
   Process.waitpid(Kernel.spawn({ 'AR_VERSION' => ar_version }, "bundle install --quiet", close_others: true))
   Process.waitpid(Kernel.spawn({ 'AR_VERSION' => ar_version }, "rspec", close_others: true))

data/docker-compose.yml

@@ -0,0 +1,10 @@
+version: "3.5"
+
+services:
+  postgres:
+    image: trx_ext/postgres
+    build: .
+    ports:
+      - 5532:5432
+    environment:
+      - POSTGRES_PASSWORD=postgres

data/lib/trx_ext/retry.rb

@@ -26,38 +26,30 @@ module TrxExt
         retries_count = 0
         begin
           yield
-        rescue => error
-          error_classification = error_classification(error)
-          if retry_query?(error, retries_count)
-            if error_classification == :record_not_unique
-              retries_count += 1
-            end
-            TrxExt.log("Detected transaction rollback condition. Reason - #{error_classification}. Retrying...")
-            retry
-          else
-            raise error
-          end
+        rescue ActiveRecord::SerializationFailure, ActiveRecord::RecordNotUnique, ActiveRecord::Deadlocked => error
+          raise unless retry_query?(error, retries_count)
+
+          retries_count += 1 unless indisputable_retry?(error)
+          TrxExt.log("Detected transaction rollback condition. Reason - #{error.inspect}. Retrying...")
+          retry
         end
       end
 
       private
 
-      def error_classification(error)
-        case
-        when error.message.index('deadlock detected')
-          :deadlock
-        when error.message.index('could not serialize')
-          :serialization_error
-        when error.class == ActiveRecord::RecordNotUnique
-          :record_not_unique
-        end
+      # @param error [ActiveRecord::ActiveRecordError]
+      # @return [Boolean]
+      def indisputable_retry?(error)
+        error.is_a?(ActiveRecord::Deadlocked) || error.is_a?(ActiveRecord::SerializationFailure)
       end
 
-      def retry_query?(error, retryies_count)
-        classification = error_classification(error)
-        ActiveRecord::Base.connection.open_transactions == 0 &&
-          (%i(deadlock serialization_error).include?(classification) ||
-            classification == :record_not_unique && retryies_count < TrxExt.config.unique_retries)
+      # @param error [ActiveRecord::ActiveRecordError]
+      # @param retries_count [Integer]
+      # @return [Boolean]
+      def retry_query?(error, retries_count)
+        return true if ActiveRecord::Base.connection.open_transactions == 0 && indisputable_retry?(error)
+
+        ActiveRecord::Base.connection.open_transactions == 0 && retries_count < TrxExt.config.unique_retries
       end
     end
   end

data/lib/trx_ext/version.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
 module TrxExt
-  VERSION = "1.0.5"
-  SUPPORTED_AR_VERSIONS = ['~> 6.0', '~> 6.1', '~> 7.0'].freeze
+  VERSION = "1.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trx_ext
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Ivan Dzyzenko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-11 00:00:00.000000000 Z
+date: 2023-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -120,6 +120,7 @@ files:
 - ".ruby-version"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -127,6 +128,7 @@ files:
 - bin/console
 - bin/setup
 - bin/test_all_ar_versions
+- docker-compose.yml
 - lib/trx_ext.rb
 - lib/trx_ext/callback_pool.rb
 - lib/trx_ext/config.rb
@@ -143,8 +145,8 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/intale/trx_ext
-  source_code_uri: https://github.com/intale/trx_ext/tree/v1.0.5
-  changelog_uri: https://github.com/intale/trx_ext/blob/v1.0.5/CHANGELOG.md
+  source_code_uri: https://github.com/intale/trx_ext/tree/v1.0.6
+  changelog_uri: https://github.com/intale/trx_ext/blob/v1.0.6/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -160,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.15
 signing_key:
 specification_version: 4
 summary: ActiveRecord's transaction extension