panda_pal 5.12.0 → 5.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab899936461dc59208ae6afef28264feda7a75927798e158ca1ee8381b2ea463
-  data.tar.gz: 20424ac6bef9bede8af9e58e8a1393267b0966f96cf56dd8ae8ed0e5b486420a
+  metadata.gz: c7b257eddedb1431e4a8030cae79245ef3c0da635ac47cd7e3d1b7ac223d630c
+  data.tar.gz: cff44cd6c69723032155a0e82a952f1ceaec1bbcc991014ab5ea5fd75a3404db
 SHA512:
-  metadata.gz: 85041955aabe8255fcf0a4e3cbcfce3c55c690e0d66d74ac511d6b4d70825d796a62a18fe3ac3e0b5dc66e9ddc865c5b45f672940d92c15a1cc38a7ac350ad91
-  data.tar.gz: bcbe2513a4b4916af671f5a913036e0154dd474d510351f6325a2f264d03c1dac10adc4c48bc060c40faafdc798268664c48e2c32943dd4ed3d0dcda076b7ff3
+  metadata.gz: 398fedeae33152e8691af37e3c32d3fc353e379839e42837779652e48d8ec2e22112eb6da0b0e24f942aaf84a727102e67d85ee573b12b5ccd42595675413a97
+  data.tar.gz: cf6e76fa5dc3aa9c338d8ba118c2f4107f945eebb4e5ebeaf059db4e2119abc69879ee38467452f0d6852855a72606e148c6ba0d05da4c60001cf3145376ba9f

data/lib/panda_pal/spec_helper.rb

@@ -2,7 +2,7 @@ module PandaPal::SpecHelper
   extend ActiveSupport::Concern
 
   class_methods do
-    def with_multiple_shards(shards:, preclean_schemas: [], determine_shard: nil, transactional: true)
+    def with_multiple_shards(shards:, tenant_names: [], determine_shard: nil, transactional: true)
       self.use_transactional_tests = transactional
 
       original_settings = {}
@@ -26,7 +26,7 @@ module PandaPal::SpecHelper
 
         Apartment::Tenant.reload!
 
-        clean_schemas(preclean_schemas)
+        clean_schemas(tenant_names)
       end
 
       after :all do
@@ -48,7 +48,7 @@ module PandaPal::SpecHelper
       end
 
       before :each do
-        clean_schemas(preclean_schemas) unless transactional
+        clean_schemas(tenant_names)
 
         @each_existing_org_ids = PandaPal::Organization.pluck(:id)
 
@@ -68,9 +68,12 @@ module PandaPal::SpecHelper
       end
 
       define_method :clean_schemas do |schemas|
-        PandaPal::Organization.where(name: schemas).delete_all
+        # Clean known schemas if an Organization record does not exist for them
+        schema_to_fqt = schemas.index_by { |s| Apartment::Tenant.split_tenant(s)[1] }
+        schemas_to_clean = schema_to_fqt.keys - PandaPal::Organization.pluck(:name)
 
-        schemas.each do |schema|
+        schemas_to_clean.each do |schema|
+          # fqt = schema_to_fqt[schema]
           Apartment::Tenant.drop(schema) rescue nil
           shards.each do |k, v|
             Apartment::Tenant.drop("#{k}:#{schema}") rescue nil

data/lib/panda_pal/version.rb

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

data/spec/core/apartment_multidb_spec.rb

@@ -6,7 +6,7 @@ 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],
+      tenant_names: %w[on_primary alt:on_alt],
       transactional: false,
       determine_shard: ->(org) { org.name.include?("alt") ? "alt" : nil }
     )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 5.12.0
+  version: 5.12.1
 platform: ruby
 authors:
 - Instructure CustomDev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-26 00:00:00.000000000 Z
+date: 2024-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails