isolator 1.1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a37693d4626a6bb72e14c00562274a1002c557aca0122182f2422be08e225ad8
-  data.tar.gz: ed49eb36314577217281389ea07d3dcb8c72c30373fd03f6b6609e2d43ea4d99
+  metadata.gz: 05b72beb85efc1ddfeb64209365e3b2326e346cce686a614349088a05406b2b7
+  data.tar.gz: 8679de3ba5f24b833054ee47a0515a8ce340fbb57880d6bf00dfa9d47ad57718
 SHA512:
-  metadata.gz: e3c11b5f2da9fa95dc4f167b757e5a0dee3466ead28cb458839b1651b8e6db0631f72b9d1bcc0de239f41adb27b3dbd99aab46cf2d3872bcd462c75aa61aa471
-  data.tar.gz: c9ea41ae4b214da35c3e5c8c53c75c5f8f3b74b620ff5e2f3d1dbfcbb52312f3620ba811829c7a46b82de87cb00420d74b55d1efc7b5a1cd47295ac4eca60afe
+  metadata.gz: 20351d43476587b537082c2e0f83a01813ec9f8f57971eedd5251bc27723b276cfe8b6c5e4c930169e309fe0144f117684393b1faabae29a890af6f482cd2224
+  data.tar.gz: 8f6ed452926f6f5e955537a5de95b2a67569153ab54a79ccb20b98fb37a775e0398f7e8be285dd39ab31750548271921047b4afd417b254a8bbfa0f600be84a4

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## master
 
+## 1.2.1 (2026-07-16)
+
+- Fix handling "finish" events for untracked (lazy) transactions. ([@sawirricardo][])
+
+## 1.2.0 (2025-11-07)
+
+- Use `ActiveRecord::Base.lease_connection` instead of `ActiveRecord::Base.connection`, if available. ([@viralpraxis][])
+
+- Add ability to limit subtransaction amount. ([@dnamsons][])
+
+  This feature is disabled by default, opt-in via: `Isolator.config.max_subtransactions_depth = :desired_depth`.
+
 ## 1.1.2 (2025-10-16)
 
 - Fix `database_cleaner` support: require `base.rb` explicitly. ([@viralpraxis][])
@@ -161,3 +173,5 @@ This, for example, makes Isolator compatible with Rails multi-database apps.
 [@tagirahmad]: https://github.com/tagirahmad
 [@arthurWD]: https://github.com/arthurWD
 [@joshuay03]: https://github.com/joshuay03
+[@viralpraxis]: https://github.com/viralpraxis
+[@sawirricardo]: https://github.com/sawirricardo

data/README.md

@@ -109,6 +109,9 @@ Isolator.configure do |config|
 
   # Turn on/off raising exceptions for simultaneous transactions to different databases
   config.disallow_per_thread_concurrent_transactions = false
+
+  # Limit the amount of allowed nested transactions
+  config.max_subtransactions_depth = 5
 end
 ```
 
@@ -332,6 +335,22 @@ The reason is that Rails started using a [separate connection pool for advisory
 
 To fix this disable migrations advisory locks by adding `advisory_locks: false` to your database configuration in `(spec|test)/internal/config/database.yml`.
 
+## ActionMailer jobs
+
+Rails 7.2 added support for the `enqueue_after_transaction_commit` configuration option, which ensures that jobs are enqueued only after all transactions have been committed. One gotcha that may lead to Isolator offenses is that `ActionMailer::MailDeliveryJob` inherits directly from `ActiveJob::Base`, rather than from your application’s top-level `ApplicationJob`.
+
+To fix this, make sure `enqueue_after_transaction_commit` is set to true on `ActiveJob::Base`, or use the global `config.active_job.enqueue_after_transaction_commit setting` if your Rails version supports it.
+
+See https://github.com/palkan/isolator/issues/93 for details.
+
+## Occasional test failures related to connection reaping
+
+In some cases, connections may be reaped and replaced mid-test, which will most likely lead to test failures because Isolator currently does not track this situation.
+
+One way to mitigate this issue is to disable ActiveRecord's connection pool reaping by setting `reaping_frequency` to `nil`.
+
+See https://github.com/palkan/isolator/issues/83 for details.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/palkan/isolator.

data/lib/isolator/database_cleaner_support.rb

@@ -6,7 +6,9 @@ require "database_cleaner/active_record/transaction"
   Module.new do
     def start
       super
-      connection_id = connection_class.connection.object_id
+
+      connection_id = connection.object_id
+
       Isolator.set_connection_threshold(
         Isolator.transactions_threshold(connection_id) + 1,
         connection_id
@@ -14,12 +16,24 @@ require "database_cleaner/active_record/transaction"
     end
 
     def clean
-      connection_id = connection_class.connection.object_id
+      connection_id = connection.object_id
+
       Isolator.set_connection_threshold(
         Isolator.transactions_threshold(connection_id) - 1,
         connection_id
       )
+
       super
     end
+
+    private
+
+    def connection
+      if Gem::Version.new("7.2") <= Gem::Version.new(Rails::VERSION::STRING)
+        connection_class.lease_connection
+      else
+        connection_class.connection
+      end
+    end
   end
 )

data/lib/isolator/orm_adapters/active_support_transaction_subscriber.rb

@@ -13,16 +13,17 @@ module Isolator
       def start(event, id, payload)
         if event.start_with?("transaction.")
           connection_id = extract_transaction_connection_id(payload)
+          stack = stacks[connection_id]
 
           # transaction.active_record can be issued without a query (when we restart the transaction),
           # so we should add a new one on the stack.
           # Example: https://github.com/rails/rails/blob/ce49fa9b31cd4a21d43db39d0cea364bce28b51d/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb#L337
-          if stacks[connection_id].last == :raw
+          if stack.last == :raw
             # Update the type of the last transaction event
-            stacks[connection_id].pop
-            stacks[connection_id] << :transaction
+            stack.pop
+            stack << :transaction
           else
-            stacks[connection_id] << :transaction
+            stack << :transaction
             Isolator.incr_transactions!(connection_id)
           end
         end
@@ -32,19 +33,23 @@ module Isolator
         if event.start_with?("sql.")
           if start_event?(payload[:sql])
             connection_id = extract_connection_id(payload)
+            stack = stacks[connection_id]
 
-            stacks[connection_id] << :raw
+            stack << :raw
 
             Isolator.incr_transactions!(connection_id)
           end
 
           if finish_event?(payload[:sql])
             connection_id = extract_connection_id(payload)
+            stack = stacks[connection_id]
 
             # Decrement only if the transaction was started in the raw mode,
             # otherwise we should wait for the "transaction" event
-            if stacks[connection_id].last == :raw
-              stacks[connection_id].pop
+            if stack.last == :raw
+              stack.pop
+              stacks.delete(connection_id) if stack.empty?
+
               Isolator.decr_transactions!(connection_id)
             end
           end
@@ -52,9 +57,14 @@ module Isolator
 
         if event.start_with?("transaction.")
           connection_id = extract_transaction_connection_id(payload)
-          stacks[connection_id].pop
+          stack = stacks[connection_id]
+
+          if stack.last == :transaction
+            stack.pop
+            stacks.delete(connection_id) if stack.empty?
 
-          Isolator.decr_transactions!(connection_id)
+            Isolator.decr_transactions!(connection_id)
+          end
         end
       end
 

data/lib/isolator/plugins/database_subtransactions.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Isolator
+  class Configuration
+    attr_accessor :max_subtransactions_depth
+  end
+
+  class MaxSubtransactionsExceededError < UnsafeOperationError
+    MESSAGE = "Allowed subtransaction amount exceeded"
+  end
+
+  Isolator.on_transaction_begin do |event|
+    next if Isolator.config.max_subtransactions_depth.nil?
+
+    depth = event[:depth]
+    next unless (depth - 1) > Isolator.config.max_subtransactions_depth
+
+    Isolator.notify(exception: MaxSubtransactionsExceededError.new, backtrace: caller)
+  end
+end

data/lib/isolator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Isolator
-  VERSION = "1.1.2"
+  VERSION = "1.2.1"
 end

data/lib/isolator.rb

@@ -120,7 +120,7 @@ module Isolator
 
     def decr_thresholds!
       self.default_threshold -= 1
-      debug!("Thresholds were incremented")
+      debug!("Thresholds were decremented")
 
       return unless state[:thresholds]
 
@@ -263,3 +263,4 @@ require "isolator/database_cleaner_support" if defined?(DatabaseCleaner)
 
 # Built-in extensions
 require "isolator/plugins/concurrent_database_transactions"
+require "isolator/plugins/database_subtransactions"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isolator
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.1
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-16 00:00:00.000000000 Z
+date: 2026-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sniffer
@@ -318,6 +318,7 @@ files:
 - lib/isolator/orm_adapters/active_support_transaction_subscriber.rb
 - lib/isolator/orm_adapters/rom_active_support.rb
 - lib/isolator/plugins/concurrent_database_transactions.rb
+- lib/isolator/plugins/database_subtransactions.rb
 - lib/isolator/railtie.rb
 - lib/isolator/simple_hashie.rb
 - lib/isolator/version.rb