pg_rls 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a75a646d5cd7efb87d4a4343d3577a307b2a4c8750a9a536d448205f3e4c59b8
-  data.tar.gz: 0b5f950a922336c4b8e343a21611dc1f299c934da8829a0b0d9f37862f04ef3e
+  metadata.gz: 8a6d6413f258e20cc03352e1327614f91bb5bcba00ce958a9a9082115e803d18
+  data.tar.gz: a89ecb17edd4fda275f660560fa33f3c15de9b7cb96e0ffdd9cb226a952d7ce4
 SHA512:
-  metadata.gz: 9697b3afdb0b1489fbcf349c44c751f5fc8c495a8a3e10f59c91f2d23be4cc7576f44960c21964817c3d1dea7dbef88954907fdb0fb3641c1ada2eb3f723742b
-  data.tar.gz: e8894ef39e132e970d7527ed01057e737900be8f44014331442eb2e4397aa6b805f563ff89c38c575b355a480258305c0a446fd890d707b34735f6dee9068579
+  metadata.gz: 9c749cc2d7a7f88f5ae996d8b24b30589f3329cd156cd7900600a5be0ae45766408e5d870eb042819a5a4548b02ac4f865685b6829ea9d77792fd56a4944d02f
+  data.tar.gz: 4a9fd2b0b6c4dee5a458d6871bb6c51f27ff6a88fefa22ef1aba94504a3c44d3020728a75ff9b59488a42dd36e1ac95e23dfe14d7c4e61771f5e5fe40402c7e9

data/CHANGELOG.md

@@ -1,6 +1,31 @@
 
 # [Released]
 
+## [1.0.4] - 2026-10-06
+
+### Fixes
+
+- **A rolled-back transaction could leave a connection on another tenant than pg_rls recorded.** Postgres undoes a
+  `SET` made inside a transaction or a savepoint that rolls back, but `rls_tenant_id` kept the tenant set inside it.
+  The next switch to that tenant skipped its `SET` and ran on whatever tenant the session had before the
+  transaction, and a reset after it was skipped as if the connection had none. Only a tenant switched without being
+  restored inside a transaction that then rolls back is affected (`run_within` restores its own before the
+  rollback); a transactional test switching the tenant is exactly that, and a concurrency test then read nothing.
+  After anything that rolls back — `ROLLBACK`, `ROLLBACK TO SAVEPOINT`, `ROLLBACK AND CHAIN` (Rails restarting a
+  transaction that had not written), and a `COMMIT` of a transaction that had already failed, which Postgres turns
+  into a rollback — the connection's tenant is now unknown (`RlsTenant::UNKNOWN`): the next switch sets it, and a
+  reset resets it. The cost is one `SET` after a rollback; whether a transaction had failed is asked of the client
+  library, with no round trip. The rollback cases and the CI matrix below come from #42 (@david-pulgarin-skydropx).
+- **Parallel tests on Rails 8.1.** `PgRls::ActiveRecord::TestDatabases` named every worker's RLS databases after it,
+  but Rails 8.1 names hidden configurations itself, so they were named twice (`test_db_1-1`) and no worker came up.
+  It now names only the ones Rails left alone, on every version.
+
+### Compatibility
+
+- The suite runs in CI on Rails 7.2, 8.0 and 8.1 — every version the gemspec allows — with parallel workers
+  (`gemfiles/`, not packaged). On Rails 8.1 the suite's coverage report is written again: the workers' teardown
+  had stopped SimpleCov in the main process too.
+
 ## [1.0.3] - 2026-10-03
 
 ### Fixes

data/lib/pg_rls/active_record/connection_adapters/rls_tenant.rb

@@ -9,8 +9,23 @@ module PgRls
       # threads, and a thread going by its own record of what it once set would skip a connection another thread
       # has since switched to another tenant — and run as that tenant.
       module RlsTenant
+        # What the connection's tenant is after a rollback: nobody knows. Postgres undoes a SET made inside a
+        # transaction or savepoint that rolls back, so the session is back on whatever tenant it had before —
+        # which may be another tenant than the one recorded here. It equals no tenant, so the next switch sets
+        # the session again, and it is not nil, so a reset resets it.
+        UNKNOWN = Object.new.freeze
+
         attr_accessor :rls_tenant_id
 
+        # A COMMIT rolls back instead when the transaction has already failed; whether it has is the client library's
+        # answer, with no round trip. (A COMMIT that fails is rolled back by Rails, which the hook below hears.)
+        def commit_db_transaction
+          rolls_back = aborted_transaction?
+          super
+        ensure
+          self.rls_tenant_id = UNKNOWN if rolls_back
+        end
+
         private
 
         # A new session has no tenant, whatever the connection's last one had: this runs on every connect,
@@ -19,6 +34,32 @@ module PgRls
           super
           self.rls_tenant_id = nil
         end
+
+        def exec_rollback_db_transaction
+          super
+        ensure
+          self.rls_tenant_id = UNKNOWN
+        end
+
+        # ROLLBACK AND CHAIN: a nested transaction rolled back in one that had not written yet.
+        def exec_restart_db_transaction
+          super
+        ensure
+          self.rls_tenant_id = UNKNOWN
+        end
+
+        def exec_rollback_to_savepoint(name = nil)
+          super
+        ensure
+          self.rls_tenant_id = UNKNOWN
+        end
+
+        # A connection the client library cannot ask is left to the COMMIT, which raises the real error.
+        def aborted_transaction?
+          @raw_connection&.transaction_status == ::PG::PQTRANS_INERROR
+        rescue ::PG::Error
+          false
+        end
       end
     end
   end

data/lib/pg_rls/active_record/test_databases.rb

@@ -3,13 +3,19 @@
 module PgRls
   module ActiveRecord
     module TestDatabases # :nodoc:
+      # Each parallel worker gets databases of its own. Rails names them, but before 8.1 only the configurations it
+      # does not hide, and pg_rls's are hidden: those are named here — and only those Rails left alone, because from
+      # 8.1 on it names hidden ones too (`<database>_<i>`), and naming them again pointed every worker at a database
+      # that does not exist.
       def create_and_load_schema(i, env_name:)
-        super
+        configs = PgRls::Record.configurations.configs_for(env_name: env_name, include_hidden: true)
+                                              .reject { |db_config| db_config.name == "primary" }
+        named = configs.to_h { |db_config| [db_config, db_config.database] }
 
-        PgRls::Record.configurations.configs_for(env_name: env_name, include_hidden: true).each do |db_config|
-          next if db_config.name == "primary"
+        super
 
-          db_config._database = "#{db_config.database}-#{i}"
+        configs.each do |db_config|
+          db_config._database = "#{db_config.database}-#{i}" if db_config.database == named[db_config]
         end
       end
     end

data/lib/pg_rls/version.rb

@@ -2,6 +2,6 @@
 
 # :nocov:
 module PgRls
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end
 # :nocov:

data/sig/pg_rls/active_record/connection_adapters.rbs

@@ -4,9 +4,21 @@ module PgRls
   module ActiveRecord
     module ConnectionAdapters
       module RlsTenant
-        attr_accessor rls_tenant_id: String?
+        UNKNOWN: Object
+
+        attr_accessor rls_tenant_id: String | Object | nil
 
         private def configure_connection: () -> void
+
+        def commit_db_transaction: () -> void
+
+        private def exec_rollback_db_transaction: () -> void
+
+        private def exec_restart_db_transaction: () -> void
+
+        private def exec_rollback_to_savepoint: (?String? name) -> void
+
+        private def aborted_transaction?: () -> bool
       end
 
       module ConnectionPool

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rls
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Daniel Laloush
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-03 00:00:00.000000000 Z
+date: 2026-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord