panda_pal 5.13.1 → 5.13.2.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1abce4e925e36c353a2985ec394d6cd3663a81023cecc9f40b7844cb6a6cfe58
-  data.tar.gz: 902fa5a2ad91c17df04f1c248a12d8db0bb32cab382b080ac6c1cce2071582e9
+  metadata.gz: 45284315302591401a70e8adf1551ded6495a1e49773bc96ea8f19f133ed9e5e
+  data.tar.gz: 43361f20d9a746ae3853eb40b65c390ce14b28f8281ff0626f12e91b21c82eb6
 SHA512:
-  metadata.gz: d0e4eeca5d559276222b43c3738af1be4c5c2516092eecaef8b2f389dfc0549671a2081d3e38596c8d2e31c12cc89aaa1af3bd2789ab7815a7aa95ac4e598e8a
-  data.tar.gz: c8dd6a0afa0655cd0568fe21f3d41329ea5071c3794968c0399a39067607d484636a5ed0f97c4650852862ec97549a64b3f10082406249b3f1928fc173f4601f
+  metadata.gz: c636a2f451c9353af8222a7f4bf10b5b571a0d13a731d1ff2cb6df1590b1864ad981d347cc83297759287ab8ba78c76e414364f6aa7a66dcb7e9366b811c3323
+  data.tar.gz: 468698cde7cd14d102c8bf7aeb33d5f1ad994796bcfe708d361e21a32194c28fd1e327eeef851d984ac436929b38c045f462dc00e69be0f16c240b32596dc980

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

@@ -149,6 +149,14 @@ module PandaPal
             code << "\n"
           end
 
+          if PandaPal::Organization.column_names.include?("shard")
+            code << "# " if persisted?
+            cur_shard = self.shard || "default"
+            valid_shards = Apartment.shard_configurations.keys
+            code << "shard: \"#{self.shard}\", # #{valid_shards.join(" | ")}"
+            code << "\n"
+          end
+
           code << "settings: "
           code << PandaPal::Organization.generate_settings_ruby(value: settings)
           code << ",\n"

data/config/initializers/apartment.rb

@@ -14,12 +14,16 @@ module Apartment
     $shard_configurations ||= begin
       shard_to_env = {}
 
+      base_config = ActiveRecord::Base.configurations.find_db_config(Rails.env).configuration_hash
+
       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
+        shardcfg = ActiveRecord::Base.configurations.resolve(url).configuration_hash
+        shardcfg = base_config.merge(shardcfg || {})
+        shard_to_env[m[2].downcase] = shardcfg
       end
 
       shard_to_env.freeze unless Rails.env.test?

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "5.13.1"
+  VERSION = "5.13.2.beta2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 5.13.1
+  version: 5.13.2.beta2
 platform: ruby
 authors:
 - Instructure CustomDev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-21 00:00:00.000000000 Z
+date: 2025-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails