ros-apartment 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c1a77f61c7ac94816e7f0a0d906435cf2f9f06d7efc979a7308ac41a99c4247
-  data.tar.gz: '08bdfedeaba0107f0931a2a1f438b2dffebcdd4df89381b5be97f7bd9de5b7d3'
+  metadata.gz: 2ff5e16756f5fc42560082bd07204b8853c85a4b4d15ce38664585b2e6631ccc
+  data.tar.gz: 168b28a0141dca9bdbdc80ea6ecf3247677b7dc138ca6d3feed213d24c11b454
 SHA512:
-  metadata.gz: c09415eddebce74732c14bf8f71ec3a4d8dab0e53f6df5d15439068964b2de79ac57c36253878456866e2021d6c8faf1a6f1a3ae12961b33d33a4118536128e3
-  data.tar.gz: db8413aa220b089dd0ab874051a5bf990e2f02b9a10da80e7e2356b8fbfd4a908346811ce6f8da0d9fc028c111fe9829ab495807e481a8b268353332d2e0c2bd
+  metadata.gz: c8899404718944dae59cc218ac48c558f6005cce6bb6f61357bca1f3a69e8e9a0bbef7950d60effcc1a02efde0ecc65062fc258565a5375a7991cc3ad2d0a293
+  data.tar.gz: 4b4aa74a1194609b254a3e08c00d493243842396f045560d6909ae3c67751dbb183d56545046bb61508f61e039ee2159875fe8fb2766d15f20cea28068a8504a

data/lib/apartment/active_record/postgresql_adapter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# rubocop:disable Style/ClassAndModuleChildren
+# rubocop:disable Style/ClassAndModuleChildren, Style/OneClassPerFile
 
 # NOTE: This patch is meant to remove any schema_prefix appart from the ones for
 # excluded models. The schema_prefix would be resolved by apartment's setting
@@ -55,4 +55,4 @@ require 'active_record/connection_adapters/postgresql_adapter'
 class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
   include Apartment::PostgreSqlAdapterPatch
 end
-# rubocop:enable Style/ClassAndModuleChildren
+# rubocop:enable Style/ClassAndModuleChildren, Style/OneClassPerFile

data/lib/apartment/adapters/jdbc_postgresql_adapter.rb

@@ -41,7 +41,7 @@ module Apartment
         raise(ActiveRecord::StatementInvalid, "Could not find schema #{tenant}") unless schema_exists?(tenant)
 
         @current = tenant.is_a?(Array) ? tenant.map(&:to_s) : tenant.to_s
-        Apartment.connection.schema_search_path = full_search_path
+        set_schema_search_path(full_search_path)
       rescue ActiveRecord::StatementInvalid, ActiveRecord::JDBCError
         raise(TenantNotFound, "One of the following schema(s) is invalid: #{full_search_path}")
       end

data/lib/apartment/adapters/postgresql_adapter.rb

@@ -41,12 +41,12 @@ module Apartment
       #
       def reset
         @current = default_tenant
-        Apartment.connection.schema_search_path = full_search_path
+        set_schema_search_path(full_search_path)
       end
 
       def init
         super
-        Apartment.connection.schema_search_path = full_search_path
+        set_schema_search_path(full_search_path)
       end
 
       def current
@@ -76,13 +76,35 @@ module Apartment
         raise(ActiveRecord::StatementInvalid, "Could not find schema #{tenant}") unless schema_exists?(tenant)
 
         @current = tenant.is_a?(Array) ? tenant.map(&:to_s) : tenant.to_s
-        Apartment.connection.schema_search_path = full_search_path
+        set_schema_search_path(full_search_path)
       rescue *rescuable_exceptions => e
         raise_schema_connect_to_new(tenant, e)
       end
 
       private
 
+      # Force a fresh +SET search_path+ even when ActiveRecord's
+      # +@schema_search_path+ cache still matches +value+. Rails 8.1 added a
+      # memoization early-return to PostgreSQLAdapter#schema_search_path= (see
+      # rails/rails#54698), which makes the assignment a no-op when the ivar
+      # is unchanged. After a transactional ROLLBACK or a connection reconnect
+      # the ivar can hold a stale value while the actual session search_path
+      # has reverted, so we must invalidate the ivar before reassigning.
+      # This is a cache-invalidating wrapper, not a plain writer.
+      #
+      # Maintenance note: this couples us to Rails' private
+      # +@schema_search_path+ ivar. Watch rails/rails#54698 for an upstream
+      # fix or a public invalidation API -- once one ships, this workaround
+      # should be dropped in favor of the public path. If a future Rails
+      # release renames or removes the ivar, this helper degrades silently
+      # back to the memoization no-op; the regression specs under
+      # +describe '#switch!'+ and +describe '#reset'+ in
+      # +spec/examples/schema_adapter_examples.rb+ are the canary.
+      def set_schema_search_path(value) # rubocop:disable Naming/AccessorMethodName
+        Apartment.connection.instance_variable_set(:@schema_search_path, nil)
+        Apartment.connection.schema_search_path = value
+      end
+
       def tenant_exists?(tenant)
         return true unless Apartment.tenant_presence_check
 

data/lib/apartment/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Apartment
-  VERSION = '3.4.1'
+  VERSION = '3.4.2'
 end

data/lib/apartment.rb

@@ -164,17 +164,22 @@ module Apartment
   end
 
   # Exceptions
-  ApartmentError = Class.new(StandardError)
+  class ApartmentError < StandardError
+  end
 
   # Raised when apartment cannot find the adapter specified in <tt>config/database.yml</tt>
-  AdapterNotFound = Class.new(ApartmentError)
+  class AdapterNotFound < ApartmentError
+  end
 
   # Raised when apartment cannot find the file to be loaded
-  FileNotFound = Class.new(ApartmentError)
+  class FileNotFound < ApartmentError
+  end
 
   # Tenant specified is unknown
-  TenantNotFound = Class.new(ApartmentError)
+  class TenantNotFound < ApartmentError
+  end
 
   # The Tenant attempting to be created already exists
-  TenantExists = Class.new(ApartmentError)
+  class TenantExists < ApartmentError
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ros-apartment
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Ryan Brunner