panda_pal 5.11.0 → 5.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75028dd065a6203af07a828ad23b78340b2b98c467ddc4def4b3935b6af31f15
-  data.tar.gz: dda65af42c0372f49c029508f9701093b99b81ca76c3cefa5448a35ba776031a
+  metadata.gz: ab899936461dc59208ae6afef28264feda7a75927798e158ca1ee8381b2ea463
+  data.tar.gz: 20424ac6bef9bede8af9e58e8a1393267b0966f96cf56dd8ae8ed0e5b486420a
 SHA512:
-  metadata.gz: 911ca0334b047224f269121dd0a65e363c6239d763b73ef7ada18c439a66f29a11c51eae57ca1edfa8ffe18aa6b88bd7677aa41a5239c3517a2bc286668d30be
-  data.tar.gz: 25e362c44747b95d1316bec3c50ed508d6bf125a4b62328d1bc0c1a5bc1a498013d67db896422ff2e526ce111a29338f02481972b0a2fbe28d743baa4015ac07
+  metadata.gz: 85041955aabe8255fcf0a4e3cbcfce3c55c690e0d66d74ac511d6b4d70825d796a62a18fe3ac3e0b5dc66e9ddc865c5b45f672940d92c15a1cc38a7ac350ad91
+  data.tar.gz: bcbe2513a4b4916af671f5a913036e0154dd474d510351f6325a2f264d03c1dac10adc4c48bc060c40faafdc798268664c48e2c32943dd4ed3d0dcda076b7ff3

data/README.md

@@ -179,6 +179,18 @@ Rails.application.config.middleware.use 'Apartment::Elevators::Generic', lambda
 It is also possible to switch tenants by implementing `around_action :switch_tenant` in the controller.
 However, it should be noted that calling `switch_tenant` must be used in an `around_action` hook (or given a block), and is only intended to be used for LTI launches, and not subsequent requests.
 
+### Sharding
+PandaPal 5.12 added support for multi-DB sharding. If you wish to use this, add a `shard` column to the `PandaPal::Organization` model. The implementation should be fairly transparent and should behave as normal PandaPal/Apartment - the only difference is that tenants can be created on different DB shards.
+
+The list of available shards is computed from the Environment variables. On startup, the application looks for variables with the following formats:
+- `SHARD_DB_XYZ_URL`
+- `HEROKU_POSTGRESQL_XYZ_URL`
+(where `XYZ` is the shard identifier)
+
+When an `Organization` is created, it is assigned to a random shard (or if no shards were discovered, it is placed in the default database as normal). Alternatively, a specific shard can be specified: `PandaPal::Organization.new(shard: "shard_a")`. An `Organization` can be added to the primary shard with `shard: "default"`
+
+The `PandaPal::Organization` record is still created in the `public` schema of the default database, as per usual.
+
 ### Rake tasks and jobs
 **Delayed Job Support has been removed. This allows each project to assess it's need to handle background jobs.**
 

data/app/models/panda_pal/organization.rb

@@ -41,6 +41,9 @@ module PandaPal
     include OrganizationConcerns::OrganizationBuilder if $stdin&.tty?
     include OrganizationConcerns::TaskScheduling if defined?(Sidekiq.schedule)
 
+    include OrganizationConcerns::TenantHandling
+    include OrganizationConcerns::MultiDatabaseSharding if (column_names rescue []).include?('shard')
+
     attr_encrypted :settings, marshal: true, key: :encryption_key, marshaler: SettingsMarshaler
     before_save {|a| a.settings = a.settings} # this is a hacky work-around to a bug where attr_encrypted is not saving settings in place
 
@@ -56,9 +59,6 @@ module PandaPal
     validates :canvas_account_id, presence: true
     validates :salesforce_id, presence: true, uniqueness: true
 
-    after_create :create_schema
-    after_commit :destroy_schema, on: :destroy
-
     define_setting("lti", {
       type: 'Hash',
       required: false,
@@ -71,10 +71,6 @@ module PandaPal
       end
     end
 
-    before_validation on: [:update] do
-      errors.add(:name, 'should not be changed after creation') if name_changed?
-    end
-
     def encryption_key
       # production environment might not have loaded secret_key_base yet.
       # In that case, just read it from env.
@@ -85,18 +81,6 @@ module PandaPal
       end
     end
 
-    def switch_tenant(&block)
-      if block_given?
-        Apartment::Tenant.switch(name, &block)
-      else
-        Apartment::Tenant.switch!(name)
-      end
-    end
-
-    def self.current
-      find_by_name(Apartment::Tenant.current)
-    end
-
     def create_api(logic, expiration: nil, uses: nil, host: nil)
       switch_tenant do
         logic = "current_organization.#{logic}" if logic.is_a?(Symbol)
@@ -109,16 +93,6 @@ module PandaPal
       end
     end
 
-    def rename!(new_name)
-      do_switch = Apartment::Tenant.current == name
-      ActiveRecord::Base.connection.execute(
-        "ALTER SCHEMA \"#{name}\" RENAME TO \"#{new_name}\";"
-      )
-      self.class.where(id: id).update_all(name: new_name)
-      reload
-      switch_tenant if do_switch
-    end
-
     if !PandaPal.lti_options[:platform].present? || PandaPal.lti_options[:platform].is_a?(String)
       CONST_PLATFORM_TYPE = Platform.resolve_platform_class(nil) rescue nil
     else
@@ -192,16 +166,6 @@ module PandaPal
       CONST_PLATFORM_TYPE
     end
 
-    private
-
-    def create_schema
-      Apartment::Tenant.create name
-    end
-
-    def destroy_schema
-      Apartment::Tenant.drop name
-    end
-
     public
 
     PandaPal.resolved_extensions_for(self).each do |ext|

data/app/models/panda_pal/organization_concerns/multi_database_sharding.rb

@@ -0,0 +1,22 @@
+module PandaPal
+  module OrganizationConcerns
+    module MultiDatabaseSharding
+      extend ActiveSupport::Concern
+
+      included do
+        if column_names.include?('shard')
+          validates :shard, format: { with: /\A[a-z0-9_]+\z/i }, allow_blank: true
+
+          before_validation on: [:update] do
+            errors.add(:shard, 'should not be changed after creation') if shard_changed?
+          end
+        end
+      end
+
+      def tenant_name
+        return "#{shard}:#{name}" if shard.present?
+        super
+      end
+    end
+  end
+end

data/app/models/panda_pal/organization_concerns/tenant_handling.rb

@@ -0,0 +1,54 @@
+module PandaPal
+  module OrganizationConcerns
+    module TenantHandling
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def current
+          find_by_name(Apartment::Tenant.current)
+        end
+      end
+
+      included do
+        after_create :create_schema
+        after_commit :destroy_schema, on: :destroy
+
+        before_validation on: [:update] do
+          errors.add(:name, 'should not be changed after creation') if name_changed?
+        end
+      end
+
+      def tenant_name
+        name
+      end
+
+      def switch_tenant(&block)
+        if block_given?
+          Apartment::Tenant.switch(tenant_name, &block)
+        else
+          Apartment::Tenant.switch!(tenant_name)
+        end
+      end
+
+      def rename!(new_name)
+        do_switch = Apartment::Tenant.current == name
+        ActiveRecord::Base.connection.execute(
+          "ALTER SCHEMA \"#{name}\" RENAME TO \"#{new_name}\";"
+        )
+        self.class.where(id: id).update_all(name: new_name)
+        reload
+        switch_tenant if do_switch
+      end
+
+      private
+
+      def create_schema
+        Apartment::Tenant.create tenant_name
+      end
+
+      def destroy_schema
+        Apartment::Tenant.drop tenant_name
+      end
+    end
+  end
+end

data/config/initializers/apartment.rb

@@ -5,13 +5,212 @@ begin
 rescue LoadError
 end
 
+require "apartment/adapters/postgresql_adapter"
+
+module Apartment
+  SHARD_PREFIXES = ["SHARD_DB", "HEROKU_POSTGRESQL"]
+
+  def self.shard_configurations
+    $shard_configurations ||= begin
+      shard_to_env = {}
+
+      ENV.keys.each do |k|
+        m = /^(#{SHARD_PREFIXES.join("|")})_(\w+)_URL$/.match(k)
+        next unless m
+
+        url = ENV[k]
+        shard_to_env[m[2].downcase] = ActiveRecord::Base.configurations.resolve(url).configuration_hash
+      end
+
+      shard_to_env.freeze unless Rails.env.test?
+
+      shard_to_env
+    end
+  end
+
+  module Tenant
+    self.singleton_class.send(:alias_method, :original_postgresql_adapter, :postgresql_adapter)
+
+    def self.postgresql_adapter(config)
+      if Apartment.with_multi_server_setup
+        adapter = Adapters::PostgresMultiDBSchemaAdapter
+        adapter.new(config)
+      else
+        original_postgresql_adapter(config)
+      end
+    end
+
+    def self.split_tenant(tenant)
+      bits = tenant.split(":", 2)
+      bits.unshift(nil) if bits.length == 1
+      bits[0] = "default" if bits[0].nil? || bits[0].empty?
+      bits
+    end
+  end
+
+  module Adapters
+    class PostgresMultiDBSchemaAdapter < Apartment::Adapters::PostgresqlSchemaAdapter
+      def initialize(*args, **kwargs)
+        super
+        @excluded_model_set = Set.new(Apartment.excluded_models)
+      end
+
+      def process_excluded_model(excluded_model)
+        @excluded_model_set << excluded_model
+        super
+      end
+
+      def is_excluded_model?(model)
+        @excluded_model_set.include?(model.to_s)
+      end
+
+      def db_connection_config(tenant)
+        shard, schema = Tenant.split_tenant(tenant)
+        if shard == "default"
+          @config
+        else
+          Apartment.shard_configurations[shard.downcase]
+        end
+      end
+
+      def drop_command(conn, tenant)
+        shard, schema = Tenant.split_tenant(tenant)
+        conn.execute(%(DROP SCHEMA "#{schema}" CASCADE))
+      end
+
+      def tenant_exists?(tenant)
+        return true unless Apartment.tenant_presence_check
+        shard, schema = Tenant.split_tenant(tenant)
+
+        Apartment.connection.schema_exists?(schema)
+      end
+
+      def create_tenant_command(conn, tenant)
+        shard, schema = Tenant.split_tenant(tenant)
+        # NOTE: This was causing some tests to fail because of the database strategy for rspec
+        if conn.open_transactions.positive?
+          conn.execute(%(CREATE SCHEMA "#{schema}")).inspect
+        else
+          schema = %(BEGIN;
+          CREATE SCHEMA "#{schema}";
+          COMMIT;)
+
+          conn.execute(schema)
+        end
+      rescue *rescuable_exceptions => e
+        rollback_transaction(conn)
+        raise e
+      end
+
+      def connect_to_new(tenant = nil)
+        return reset if tenant.nil?
+
+        current_tenant = @current
+        tenants_array = tenant.is_a?(Array) ? tenant.map(&:to_s) : tenant.to_s
+        tenant_schemas = map_to_schemas(Array(tenants_array))
+        query_cache_enabled = ActiveRecord::Base.connection.query_cache_enabled
+
+        @current = tenants_array
+
+        raise ActiveRecord::StatementInvalid, "PandaPal/Apartment Mutli-DB support does not currently support DB roles" if ActiveRecord::Base.current_role != ActiveRecord::Base.default_role
+
+        unless ActiveRecord::Base.connected?
+          Apartment.establish_connection multi_tenantify(tenant, false)
+          Apartment.connection.verify!
+        end
+
+        Apartment.connection.enable_query_cache! if query_cache_enabled
+
+        raise ActiveRecord::StatementInvalid, "Could not find schema for tenant #{tenant} (#{tenant_schemas.inspect})" unless schema_exists?(tenant_schemas)
+
+        Apartment.connection.schema_search_path = full_search_path
+      rescue *rescuable_exceptions => e
+        @current = current_tenant
+        raise_schema_connect_to_new(tenant, e)
+      end
+
+      protected
+
+      def persistent_schemas
+        map_to_schemas(super)
+      end
+
+      def map_to_schemas(tenants)
+        all_shard = nil
+        tenants.map do |schema|
+          shard, schema = Tenant.split_tenant(schema)
+          all_shard ||= shard
+          raise "Cannot mix shards in persistent_schemas" if shard != all_shard
+          schema
+        end
+      end
+    end
+  end
+
+  module CorePatches
+    module ActiveRecord
+      module FutureResult
+        # called in the original thread that knows the tenant
+        def initialize(_pool, *_args, **_kwargs)
+          @tenant = Apartment::Tenant.current
+          super
+        end
+
+        # called in the new thread with a connection that needs switching
+        def exec_query(_conn, *_args, **_kwargs)
+          Apartment::Tenant.switch!(@tenant) unless Apartment::Tenant.current == @tenant
+          super
+        end
+      end
+
+      module Base
+        extend ActiveSupport::Concern
+
+        included do
+          self.singleton_class.send(:alias_method, :pre_apartment_current_shard, :current_shard)
+
+          def self.current_shard
+            # This implementation is definitely a hack, but it should be fairly compatible. If you need to leverage
+            #   Rails' sharding natively - you should just need to add models to the excluded_models list in Apartment
+            #   to effectively disable this patch for that model.
+            if (adapter = Thread.current[:apartment_adapter]) && adapter.is_a?(Apartment::Adapters::PostgresMultiDBSchemaAdapter) && !adapter.is_excluded_model?(self)
+              shard, schema = Apartment::Tenant.split_tenant(adapter.current)
+              return "apt:#{shard}" unless shard == "default"
+            end
+
+            pre_apartment_current_shard
+          end
+        end
+      end
+    end
+  end
+
+  # Fix Apartment's lack of support for load_async
+  ::ActiveRecord::FutureResult.prepend CorePatches::ActiveRecord::FutureResult
+
+  # Hack ActiveRecord shards/connection_pooling to support our multi-DB approach
+  ::ActiveRecord::Base.include CorePatches::ActiveRecord::Base
+end
+
 Apartment.configure do |config|
   config.excluded_models ||= []
   config.excluded_models |= ['PandaPal::Organization', 'PandaPal::Session']
 
-  config.tenant_names = lambda {
-    PandaPal::Organization.pluck(:name)
-  }
+  config.with_multi_server_setup = true unless Rails.env.test?
+
+  config.tenant_names = lambda do
+    if PandaPal::Organization < PandaPal::OrganizationConcerns::MultiDatabaseSharding
+      base_config = Apartment.connection_config
+      shard_configurations = Apartment.shard_configurations
+
+      PandaPal::Organization.all.to_a.each_with_object({}) do |org, hash|
+        shard = org.shard || "default"
+        hash[org.tenant_name] = shard == "default" ? base_config : shard_configurations[shard.downcase]
+      end
+    else
+      PandaPal::Organization.pluck(:name)
+    end
+  end
 end
 
 Rails.application.config.middleware.use Apartment::Elevators::Generic, lambda { |request|

data/lib/panda_pal/engine.rb

@@ -7,8 +7,6 @@ require_relative './helpers/console_helpers'
 
 module PandaPal
   class Engine < ::Rails::Engine
-    config.autoload_once_paths += Dir["#{config.root}/lib/**/"]
-
     isolate_namespace PandaPal
 
     config.generators do |g|

data/lib/panda_pal/spec_helper.rb

@@ -0,0 +1,82 @@
+module PandaPal::SpecHelper
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def with_multiple_shards(shards:, preclean_schemas: [], determine_shard: nil, transactional: true)
+      self.use_transactional_tests = transactional
+
+      original_settings = {}
+
+      before :all do
+        if defined?(DatabaseCleaner)
+          original_settings[:cleaner_strategy] = DatabaseCleaner.strategy
+          DatabaseCleaner.strategy = :truncation
+        end
+
+        Apartment.configure do |config|
+          original_settings[:with_multi_server_setup] = config.with_multi_server_setup
+          config.with_multi_server_setup = true
+        end
+
+        shards.each do |k, v|
+          Apartment.shard_configurations[k.to_s] = Apartment.connection_config.merge(database: v)
+        end
+
+        @existing_org_ids = PandaPal::Organization.pluck(:id)
+
+        Apartment::Tenant.reload!
+
+        clean_schemas(preclean_schemas)
+      end
+
+      after :all do
+        Apartment::Tenant.reset
+
+        Apartment.configure do |config|
+          config.with_multi_server_setup = false
+        end
+
+        shards.each do |k, _|
+          Apartment.shard_configurations.delete(k.to_s)
+        end
+
+        PandaPal::Organization.where.not(id: @existing_org_ids).delete_all
+
+        if defined?(DatabaseCleaner)
+          DatabaseCleaner.strategy = original_settings[:cleaner_strategy]
+        end
+      end
+
+      before :each do
+        clean_schemas(preclean_schemas) unless transactional
+
+        @each_existing_org_ids = PandaPal::Organization.pluck(:id)
+
+        if determine_shard
+          allow_any_instance_of(PandaPal::Organization).to receive(:tenant_name) do |org|
+            shard = determine_shard.call(org)
+            tenant = org.name
+            tenant = "#{shard}:#{tenant}" if shard.present?
+            tenant
+          end
+        end
+      end
+
+      after :each do
+        Apartment::Tenant.reset
+        PandaPal::Organization.where.not(id: @each_existing_org_ids).destroy_all
+      end
+
+      define_method :clean_schemas do |schemas|
+        PandaPal::Organization.where(name: schemas).delete_all
+
+        schemas.each do |schema|
+          Apartment::Tenant.drop(schema) rescue nil
+          shards.each do |k, v|
+            Apartment::Tenant.drop("#{k}:#{schema}") rescue nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "5.11.0"
+  VERSION = "5.12.0"
 end

data/panda_pal.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.test_files = Dir["spec/**/*"].reject{|f| f =~ /\/log\//}
 
   s.add_dependency "rails", ">= 4.2"
-  s.add_dependency 'ros-apartment', '~> 2.2'
+  s.add_dependency 'ros-apartment', '~> 3.0'
   s.add_dependency 'ims-lti', '~> 1.2.4'
   s.add_dependency 'browser', '2.5.0'
   s.add_dependency 'attr_encrypted', '~> 4.0.0'
@@ -30,11 +30,11 @@ Gem::Specification.new do |s|
   s.add_dependency 'jwt'
   s.add_dependency 'httparty'
 
-  s.add_development_dependency "rails", "~> 5.2"
+  s.add_development_dependency "rails", "~> 7.0"
   s.add_development_dependency 'pg'
   s.add_development_dependency 'sidekiq', "< 7.0"
   s.add_development_dependency 'sidekiq-scheduler'
-  s.add_development_dependency 'ros-apartment', '~> 2.11'
+  s.add_development_dependency 'ros-apartment', '~> 3.0'
   s.add_development_dependency 'ros-apartment-sidekiq', '~> 1.2'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'factory_girl_rails'

data/spec/core/apartment_multidb_spec.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe PandaPal::Organization, type: :model do
+  context "across multiple DBs" do
+    with_multiple_shards(
+      shards: { alt: "panda_pal_test2" },
+      preclean_schemas: %w[on_primary on_alt],
+      transactional: false,
+      determine_shard: ->(org) { org.name.include?("alt") ? "alt" : nil }
+    )
+
+    let!(:org1) { create(:panda_pal_organization, name: "on_primary") }
+    let!(:org2) { create(:panda_pal_organization, name: "on_alt") }
+
+    it "successfully creates tenants on multiple shards" do
+      expect(1).to eql(1)
+    end
+
+    it "only creates schemas on the target shard" do
+      org1.switch_tenant do
+        schemas = PandaPal::ApiCall.connection.exec_query("SELECT schema_name FROM information_schema.schemata").pluck("schema_name")
+        expect(schemas).to include("on_primary")
+        expect(schemas).to_not include("on_alt")
+      end
+      org2.switch_tenant do
+        schemas = PandaPal::ApiCall.connection.exec_query("SELECT schema_name FROM information_schema.schemata").pluck("schema_name")
+        expect(schemas).to include("on_alt")
+        expect(schemas).to_not include("on_primary")
+      end
+    end
+
+    context "load_async" do
+      it "works across shards" do
+        qs = []
+        PandaPal::Organization.all.each do |org|
+          org.switch_tenant do
+            PandaPal::ApiCall.create!(logic: org.name)
+            qs << PandaPal::ApiCall.select("logic, pg_sleep(0.5)").load_async
+          end
+        end
+        calls = qs.map(&:to_a).flatten
+        expect(calls.pluck(:logic)).to match_array(["on_primary", "on_alt"])
+      end
+    end
+  end
+end

data/spec/dummy/config/database.yml

@@ -14,8 +14,12 @@ development:
   database: panda_pal_development
 
 test:
-  <<: *default
-  database: panda_pal_test
+  test1:
+    <<: *default
+    database: panda_pal_test1
+  test2:
+    <<: *default
+    database: panda_pal_test2
 
 production:
   <<: *default

data/spec/dummy/config/environments/test.rb

@@ -37,6 +37,11 @@ Rails.application.configure do
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
+  config.log_level = :debug
+  config.active_record.verbose_query_logs = true
+  config.active_record.async_query_executor = :multi_thread_pool
+  # config.active_record.global_executor_concurrency = 4
+
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 end

data/spec/dummy/db/test2_schema.rb

@@ -0,0 +1,18 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 2022_07_21_095653) do
+
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
+end

data/spec/models/panda_pal/api_call_spec.rb

@@ -17,7 +17,7 @@ module PandaPal
 
     describe "#call" do
       it "calls the function with parameters" do
-        expect(subject.call(foo: 'FOO')).to eq 'FOO_bar'
+        expect(subject.call({ foo: 'FOO' })).to eq 'FOO_bar'
       end
     end
 

data/spec/models/panda_pal/organization/settings_validation_spec.rb

@@ -5,6 +5,10 @@ module PandaPal
   RSpec.describe OrganizationConcerns::SettingsValidation, type: :model do
     let!(:org) { create :panda_pal_organization }
 
+    after :all do
+      PandaPal.lti_options[:settings_structure] = nil
+    end
+
     def set_test_settings_structure
       PandaPal.lti_options = {
         title: 'Test App',

data/spec/rails_helper.rb

@@ -1,6 +1,10 @@
 ActiveRecord::Migration.maintain_test_schema!
 
+require "panda_pal/spec_helper"
+
 RSpec.configure do |config|
+  config.include PandaPal::SpecHelper
+
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
 

data/spec/spec_helper.rb

@@ -11,7 +11,6 @@ require 'factory_girl_rails'
 
 ActiveRecord::Migration.maintain_test_schema!
 ActiveRecord::Schema.verbose = false
-load 'dummy/db/schema.rb' # db agnostic
 
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 5.11.0
+  version: 5.12.0
 platform: ruby
 authors:
 - Instructure CustomDev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-25 00:00:00.000000000 Z
+date: 2024-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: ims-lti
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: ros-apartment-sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -282,7 +282,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.7.1
-description: 
+description:
 email:
 - pseng@instructure.com
 executables: []
@@ -311,9 +311,11 @@ files:
 - app/lib/panda_pal/lti_jwt_validator.rb
 - app/models/panda_pal/api_call.rb
 - app/models/panda_pal/organization.rb
+- app/models/panda_pal/organization_concerns/multi_database_sharding.rb
 - app/models/panda_pal/organization_concerns/organization_builder.rb
 - app/models/panda_pal/organization_concerns/settings_validation.rb
 - app/models/panda_pal/organization_concerns/task_scheduling.rb
+- app/models/panda_pal/organization_concerns/tenant_handling.rb
 - app/models/panda_pal/panda_pal_record.rb
 - app/models/panda_pal/platform.rb
 - app/models/panda_pal/platform/canvas.rb
@@ -343,21 +345,23 @@ files:
 - lib/panda_pal/helpers/secure_headers.rb
 - lib/panda_pal/helpers/session_replacement.rb
 - lib/panda_pal/plugins.rb
+- lib/panda_pal/spec_helper.rb
 - lib/panda_pal/version.rb
 - lib/tasks/panda_pal_tasks.rake
 - panda_pal.gemspec
 - spec/controllers/panda_pal/api_call_controller_spec.rb
+- spec/core/apartment_multidb_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/bin/bundle
+- spec/dummy/app/bin/rails
+- spec/dummy/app/bin/rake
+- spec/dummy/app/bin/setup
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/bin/setup
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -377,6 +381,7 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/db/schema.rb
+- spec/dummy/db/test2_schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -394,7 +399,7 @@ homepage: http://instructure.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -409,52 +414,54 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.5.16
+signing_key:
 specification_version: 4
 summary: LTI mountable engine
 test_files:
-- spec/spec_helper.rb
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/views/layouts/application.html.erb
+- spec/controllers/panda_pal/api_call_controller_spec.rb
+- spec/core/apartment_multidb_spec.rb
+- spec/dummy/README.rdoc
+- spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/bin/bundle
+- spec/dummy/app/bin/rails
+- spec/dummy/app/bin/rake
+- spec/dummy/app/bin/setup
+- spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/bin/rake
-- spec/dummy/bin/setup
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environment.rb
+- spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config/application.rb
-- spec/dummy/config/database.yml
 - spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/secrets.yml
 - spec/dummy/config.ru
-- spec/dummy/Rakefile
-- spec/dummy/public/favicon.ico
+- spec/dummy/db/schema.rb
+- spec/dummy/db/test2_schema.rb
+- spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
-- spec/dummy/public/404.html
-- spec/dummy/db/schema.rb
-- spec/dummy/README.rdoc
+- spec/dummy/public/favicon.ico
+- spec/factories/panda_pal_organizations.rb
+- spec/factories/panda_pal_sessions.rb
+- spec/models/panda_pal/api_call_spec.rb
 - spec/models/panda_pal/organization/settings_validation_spec.rb
 - spec/models/panda_pal/organization/task_scheduling_spec.rb
-- spec/models/panda_pal/session_spec.rb
-- spec/models/panda_pal/api_call_spec.rb
 - spec/models/panda_pal/organization_spec.rb
-- spec/factories/panda_pal_sessions.rb
-- spec/factories/panda_pal_organizations.rb
-- spec/controllers/panda_pal/api_call_controller_spec.rb
+- spec/models/panda_pal/session_spec.rb
 - spec/rails_helper.rb
+- spec/spec_helper.rb