panda_pal 5.16.1 → 5.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b33c2970defb1a7405a8482186720ab63a05b10db522e4c39ce56b9aa38c1b9
-  data.tar.gz: 6a44dc5db6d135882e4c2aefe8b7872ea87ccd066fe329b0764e2f8564694800
+  metadata.gz: 7c39df6be8d76f63ab12597a80696f629aac5da4a400adfa30119f303177251c
+  data.tar.gz: 2ab2639ea53d3e698244d65313f94b5ebc6c5edcb5039efc0b7dd801658a1603
 SHA512:
-  metadata.gz: 589b2581d892bca49ba635d01a70b9db1f6044b9c885758fdbfb6d483ca3c91861bc22515fdbde2086499c7d380b96f199f8dd26e44e1cd900f2a3c3c72fc53a
-  data.tar.gz: 330d2c17013313a47f361f12709acd99291fe918cdea00405b7f76d55925557000c66b0eee08ea68049ece4acd77e86db1fd3acec73ccacaa3165e235cadcafa
+  metadata.gz: '06705595bcabf1959f7a2d72e7174d6944acc0876770878aa700d926d5b4beefdbb4a8af9462009a253d6eaf4a3fc3870f915291baa6490f5d2ecd756f84a275'
+  data.tar.gz: dac25e88efe02b2982e6441506e5d17328b3ee4500627d400523f37da6f7e6093c2a5d85492a73eb5946e616bc0ae7839730620ed66deb8986c952e416fc8f83

data/config/initializers/apartment.rb

@@ -251,29 +251,6 @@ end
 ActiveSupport::Cache::Store.send(:prepend, PandaPal::Plugins::ApartmentCache)
 
 if defined?(ActionCable)
-  module ActionCable
-    module Channel
-      class Base
-        def self.broadcasting_for(model)
-          # Rails 5 #stream_for passes #channel_name as part of model. Rails 6 doesn't and includes it via #broadcasting_for.
-          model = [channel_name, model] unless model.is_a?(Array)
-          serialize_broadcasting([ Apartment::Tenant.current, model ])
-        end
-
-        def self.serialize_broadcasting(object)
-          case
-          when object.is_a?(Array)
-            object.map { |m| serialize_broadcasting(m) }.join(":")
-          when object.respond_to?(:to_gid_param)
-            object.to_gid_param
-          else
-            object.to_param
-          end
-        end
-      end
-    end
-  end
-
   module PandaPal::Plugins::ActionCableApartment
     module Connection
       def tenant=(name)
@@ -283,13 +260,81 @@ if defined?(ActionCable)
       def tenant
         @tenant || 'public'
       end
+    end
+  end
+
+  if Rails.version < '7.0'
+    module ActionCable
+      module Channel
+        class Base
+          def self.broadcasting_for(model)
+            # Rails 5 #stream_for passes #channel_name as part of model. Rails 6 doesn't and includes it via #broadcasting_for.
+            model = [channel_name, model] unless model.is_a?(Array)
+            serialize_broadcasting([ Apartment::Tenant.current, model ])
+          end
+
+          def self.serialize_broadcasting(object)
+            case
+            when object.is_a?(Array)
+              object.map { |m| serialize_broadcasting(m) }.join(":")
+            when object.respond_to?(:to_gid_param)
+              object.to_gid_param
+            else
+              object.to_param
+            end
+          end
+        end
+      end
+    end
 
+    module PandaPal::Plugins::ActionCableApartment::Connection
       def dispatch_websocket_message(*args, **kwargs)
         Apartment::Tenant.switch(tenant) do
           super
         end
       end
     end
+  else
+    module ActionCable
+      module Channel
+        class Base
+          def self.broadcasting_for(*args)
+            cconn = ActionCable.server.worker_pool.connection
+            items = [cconn&.tenant || Apartment::Tenant.current, channel_name, *args]
+            serialize_broadcasting(items)
+          end
+        end
+      end
+    end
+
+    ActionCable::Server::Worker.set_callback :work, :around do |_, blk|
+      pten = Thread.current[:cable_tenant]
+      Thread.current[:cable_tenant] = connection.tenant
+      blk.call
+    ensure
+      Thread.current[:cable_tenant] = pten
+    end
+
+    if Apartment::Tenant.adapter.is_a?(Apartment::Adapters::PostgresqlSchemaAdapter)
+      module ApartmentConnPoolMixin
+        # Allows cable channels to lazy-load the tenant schema on first use
+        #   (Using `switch` will ping the DB even if no queries are made)
+        def acquire_connection(...)
+          super.tap do |conn|
+            if ct = Thread.current[:cable_tenant]
+              Thread.current[:cable_tenant] = nil
+              adapter = Apartment::Tenant.adapter
+              # Apartment::Tenant.switch!(ct)
+              Thread.current[:cable_tenant] = ct
+              adapter.instance_variable_set(:@current, ct)
+              conn.schema_search_path = adapter.send :full_search_path
+            end
+          end
+        end
+      end
+
+      ActiveRecord::ConnectionAdapters::ConnectionPool.prepend(ApartmentConnPoolMixin)
+    end
   end
 
   ActionCable::Connection::Base.prepend(PandaPal::Plugins::ActionCableApartment::Connection)

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "5.16.1"
+  VERSION = "5.16.2"
 end

data/spec/core/apartment_multidb_spec.rb

@@ -31,6 +31,28 @@ RSpec.describe PandaPal::Organization, type: :model do
       end
     end
 
+    it "creates records on the target shard and schema" do
+      org1.switch_tenant
+      PandaPal::ApiCall.create!(logic: "from_primary")
+      expect(PandaPal::ApiCall.count).to eq(1)
+      expect(PandaPal::ApiCall.first.logic).to eq("from_primary")
+
+      org2.switch_tenant
+      PandaPal::ApiCall.create!(logic: "from_alt")
+      expect(PandaPal::ApiCall.count).to eq(1)
+      expect(PandaPal::ApiCall.first.logic).to eq("from_alt")
+
+      org1.switch_tenant
+      expect(PandaPal::ApiCall.count).to eq(1)
+      expect(PandaPal::ApiCall.first.logic).to eq("from_primary")
+      expect(PandaPal::ApiCall.connection.exec_query("SELECT current_database()").pluck("current_database")[0]).to eq("panda_pal_test1")
+
+      org2.switch_tenant
+      expect(PandaPal::ApiCall.count).to eq(1)
+      expect(PandaPal::ApiCall.first.logic).to eq("from_alt")
+      expect(PandaPal::ApiCall.connection.exec_query("SELECT current_database()").pluck("current_database")[0]).to eq("panda_pal_test2")
+    end
+
     context "load_async" do
       it "works across shards" do
         qs = []

metadata

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