fix: add missing drop schema when dropping database

doctrine · Dec 18, 2024 · cca8165 · cca8165
1 parent 7a82524
commit cca8165
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 0 deletions.
diff --git a/src/SQL/Builder/DropSchemaObjectsSQLBuilder.php b/src/SQL/Builder/DropSchemaObjectsSQLBuilder.php
@@ -23,6 +23,7 @@ public function buildSQL(Schema $schema): array
         return array_merge(
             $this->buildSequenceStatements($schema->getSequences()),
             $this->buildTableStatements($schema->getTables()),
+            $this->buildNamespaceStatements($schema->getNamespaces()),
         );
     }
 
@@ -51,4 +52,24 @@ private function buildSequenceStatements(array $sequences): array
 
         return $statements;
     }
+
+    /**
+     * @param list<string> $namespaces
+     *
+     * @return list<string>
+     */
+    private function buildNamespaceStatements(array $namespaces): array
+    {
+        if (! $this->platform->supportsSchemas()) {
+            return [];
+        }
+
+        $statements = [];
+
+        foreach ($namespaces as $namespace) {
+            $statements[] = $this->platform->getDropSchemaSQL($namespace);
+        }
+
+        return $statements;
+    }
 }
diff --git a/tests/Functional/Schema/SchemaManagerFunctionalTestCase.php b/tests/Functional/Schema/SchemaManagerFunctionalTestCase.php
@@ -1419,6 +1419,31 @@ public function testDropColumnWithDefault(): void
         self::assertCount(1, $columns);
     }
 
+    public function testDropWithSchema(): void
+    {
+        $platform = $this->connection->getDatabasePlatform();
+
+        if (! $platform->supportsSchemas()) {
+            self::markTestSkipped('The platform does not support schemas/namespaces.');
+        }
+
+        $this->dropTableIfExists('some_schema.test_namespace');
+
+        $schema = new Schema();
+        $table  = $schema->createTable('some_schema.test_namespace');
+        $table->addColumn('id', Types::INTEGER, ['notnull' => true]);
+        $table->setPrimaryKey(['id']);
+
+        $schemaManager = $this->connection->createSchemaManager();
+        $schemaManager->createSchemaObjects($schema);
+        self::assertSame(['public', 'some_schema'], $schemaManager->listSchemaNames());
+
+        $schema = $schemaManager->introspectSchema();
+        $schemaManager->dropSchemaObjects($schema);
+
+        self::assertSame([], $schemaManager->listSchemaNames());
+    }
+
     /** @param list<Table> $tables */
     protected function findTableByName(array $tables, string $name): ?Table
     {