panda_pal 5.16.3 → 5.16.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2c0409f3edd41806fcd606b52eb0c6441c43dac7b9e1eeb89c1871b6e08525f
-  data.tar.gz: 14b3313348391ab1c364ee9bb404af319bf93b831fc5bd552059faf41a179b71
+  metadata.gz: ed57241456e0fe78d006855d50152d47c8a328b777bf77d16b53e0a59519e766
+  data.tar.gz: '0748669e4a1e3a83f9e8653b08f8c200b755d9b41a0b61e4dda1b83dbd8859c5'
 SHA512:
-  metadata.gz: e2c460dd7ac5ff05da55ef6db233f0d266983927e6a295b469d1d19002ea833b26479c5b7db53fb6306761afc683bf3494fc07c63f1ac401f736d73ad803248b
-  data.tar.gz: bcccc2e5ad50d546f3258e513118e97a37f8104901436b3b3920d64986ad83159034a905cce7ded7b81529989d16d8151f0583ec7b273732e2d38be443a6dc8e
+  metadata.gz: 5bb3ebb3379973fe51332a46807d6e69c55e4134cca476829231dd3539cdfc21e02af95a91dd32300b4bcd54018dd17061f144318b06577d4f33fae44c5a8ee6
+  data.tar.gz: 7f924b2f17246b33c5b535c80e0fd6ebef89ccd450d4c78687ae93d2247324ffacb4e8e58c99cfd92f7604ece73e8ebbbd9903af037fa1afa96f8c2063ced03d

data/config/initializers/apartment.rb

@@ -287,32 +287,34 @@ ActiveSupport.on_load(:action_cable) do
   #     at which time we hack-in the correct tenant/schema.
 
   ActionCable::Server::Worker.set_callback :work, :around do |_, blk|
-    # Bit of a hack, but ensures the adapter is initialized (since such may incur DB calls (requiring a connection)
-    #   which would then cause `checkout` to recurse)
-    Apartment::Tenant.adapter
+    # Bit of a hack, but placing this here ensures the adapter is initialized (since such may incur DB calls (requiring a connection)
+    #   which could then cause `checkout` to recurse)
+    Thread.current[:cable_tenant] = {
+      adapter: Apartment::Tenant.adapter,
+      tenant: connection.tenant,
+    }
 
     # If the current thread already has a connection checked out, release it back to the pool so that the later after_checkout
     #   callback can set the schema properly.
     pool = Apartment.connection_class.connection_pool
     pool.release_connection if pool.active_connection?
 
-    Thread.current[:cable_tenant] = connection.tenant
+    Apartment::Tenant.adapter.instance_variable_set(:@current, connection.tenant)
+
     blk.call
   ensure
     Thread.current[:cable_tenant] = nil
   end
 
   ActiveSupport.on_load(:active_record) do
-    if Apartment::Tenant.adapter.is_a?(Apartment::Adapters::PostgresqlSchemaAdapter)
-      ActiveRecord::Base.connection.class.set_callback :checkout, :after do |conn|
-        next unless conn.pool == Apartment.connection_class.connection_pool
-
-        if (ct = Thread.current[:cable_tenant]).present?
-          adapter = Apartment::Tenant.adapter
-          adapter.instance_variable_set(:@current, ct)
-          conn.schema_search_path = adapter.send :full_search_path
-        end
-      end
+    ActiveRecord::Base.connection.class.set_callback :checkout, :after do |conn|
+      next unless (ct = Thread.current[:cable_tenant]).present?
+      next unless Apartment::Tenant.adapter.is_a?(Apartment::Adapters::PostgresqlSchemaAdapter)
+      next unless conn.pool == Apartment.connection_class.connection_pool
+
+      adapter = ct[:adapter]
+      adapter.instance_variable_set(:@current, ct[:tenant])
+      conn.schema_search_path = adapter.send :full_search_path
     end
   end
 end

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "5.16.3"
+  VERSION = "5.16.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 5.16.3
+  version: 5.16.5
 platform: ruby
 authors:
 - Instructure CustomDev