Also match custom default tenant on PSQL_DUMP_BLACKLISTED_STATEMENTS (r…

…ails-on-services#293) * Add failing spec creating tenant with a default tenant * Make PSQL_DUMP_BLACKLISTED_STATEMENTS work with a default tenant --------- Co-authored-by: Mauricio Novelo <[email protected]>
Nordplaner · Oct 30, 2024 · ec5a9bc · ec5a9bc
1 parent 4a58bb3
commit ec5a9bc
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/lib/apartment/adapters/postgresql_adapter.rb b/lib/apartment/adapters/postgresql_adapter.rb
@@ -146,8 +146,8 @@ class PostgresqlSchemaFromSqlAdapter < PostgresqlSchemaAdapter
         /SET row_security/i,                          # new in postgresql 9.5
         /SET idle_in_transaction_session_timeout/i,   # new in postgresql 9.6
         /SET default_table_access_method/i,           # new in postgresql 12
-        /CREATE SCHEMA public/i,
-        /COMMENT ON SCHEMA public/i,
+        /CREATE SCHEMA/i,
+        /COMMENT ON SCHEMA/i,
         /SET transaction_timeout/i,                   # new in postgresql 17
 
       ].freeze

diff --git a/spec/examples/schema_adapter_examples.rb b/spec/examples/schema_adapter_examples.rb
@@ -93,6 +93,27 @@
 
       after { subject.drop(db) }
     end
+
+    context 'with a default_tenant', default_tenant: true do
+      let(:from_default_tenant) { 'new_from_custom_default_tenant' }
+
+      before do
+        subject.create(from_default_tenant)
+      end
+
+      after do
+        subject.drop(from_default_tenant)
+      end
+
+      it 'should correctly create the new schema' do
+        expect(tenant_names).to include(from_default_tenant)
+      end
+
+      it 'should load schema.rb to new schema' do
+        connection.schema_search_path = from_default_tenant
+        expect(connection.tables).to include('users')
+      end
+    end
   end
 
   describe '#drop' do

diff --git a/spec/support/contexts.rb b/spec/support/contexts.rb
@@ -6,7 +6,9 @@
   let(:default_tenant) { Apartment::Test.next_db }
 
   before do
-    Apartment::Test.create_schema(default_tenant)
+    # create a new tenant using apartment itself instead of Apartment::Test.create_schema
+    # so the default tenant also have the tables used in tests
+    Apartment::Tenant.create(default_tenant)
     Apartment.default_tenant = default_tenant
   end