Fix for Issue doctrine#1487

cristi-contiu · Feb 28, 2025 · acfad01 · acfad01
1 parent aaff3f4
commit acfad01
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/src/Generator/DiffGenerator.php b/src/Generator/DiffGenerator.php
@@ -146,6 +146,10 @@ private function createToSchema(): Schema
      */
     private function resolveTableName(string $name): string
     {
+        if ($this->platform->supportsSchemas()) {
+            return $name;
+        }
+
         $pos = strpos($name, '.');
 
         return $pos === false ? $name : substr($name, $pos + 1);

diff --git a/tests/Generator/DiffGeneratorTest.php b/tests/Generator/DiffGeneratorTest.php
@@ -18,6 +18,7 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+use function array_map;
 use function array_values;
 use function preg_match;
 
@@ -183,7 +184,12 @@ public function testGenerateFromEmptySchema(): void
         self::assertSame('path2', $this->migrationDiffGenerator->generate('2345', null, false, 120, true, true));
     }
 
-    public function testGenerateAppliesDbalSchemaAssetsFilterOnQualifiedTableName(): void
+    /**
+     * @param array<int, string> $expectedTables
+     *
+     * @dataProvider getGenerateAppliesFilterOnMappedSchemaData
+     */
+    public function testGenerateAppliesFilterOnMappedSchema(bool $platformSupportsSchemas, array $expectedTables): void
     {
         // a standard Regex SchemaAssetsFilter already registered on the DBAL
         $dbalSchemaAssetsFilter = static function ($assetName): bool {
@@ -198,7 +204,7 @@ public function testGenerateAppliesDbalSchemaAssetsFilterOnQualifiedTableName():
 
         $this->platform->expects(self::atLeast(2))
             ->method('supportsSchemas')
-            ->willReturn(true);
+            ->willReturn($platformSupportsSchemas);
 
         $this->schemaManager->expects(self::once())
             ->method('introspectSchema')
@@ -225,7 +231,18 @@ public function testGenerateAppliesDbalSchemaAssetsFilterOnQualifiedTableName():
 
         $this->migrationDiffGenerator->generate('Version1234', null);
 
-        self::assertEquals([$toTable1, $toTable2], array_values($toSchema->getTables()));
+        $filteredTableNames = array_map(static fn (Table $table) => $table->getName(), $toSchema->getTables());
+
+        self::assertSame($expectedTables, array_values($filteredTableNames));
+    }
+
+    /** @return array<string, array<int, bool|array<int, string>>> */
+    public static function getGenerateAppliesFilterOnMappedSchemaData(): array
+    {
+        return [
+            'platform without schemas supports' => [false, []],
+            'platform with schema schemas support' => [true, ['some_schema.table1', 'some_schema.table2']],
+        ];
     }
 
     protected function setUp(): void