Fix PostgreSQL re-adding of foreign keys when referenced table is a r…

…eserved word and in a custom schema
doctrine · Feb 14, 2025 · ad1b24a · ad1b24a
1 parent 2b09bad
commit ad1b24a
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 0 deletions.
diff --git a/src/Schema/ForeignKeyConstraint.php b/src/Schema/ForeignKeyConstraint.php
@@ -251,6 +251,10 @@ public function getUnqualifiedForeignTableName()
             $name = substr($name, $position + 1);
         }
 
+        if ($this->isIdentifierQuoted($name)) {
+            $name = $this->trimQuotes($name);
+        }
+
         return strtolower($name);
     }
 

diff --git a/tests/Functional/Schema/PostgreSQLSchemaManagerTest.php b/tests/Functional/Schema/PostgreSQLSchemaManagerTest.php
@@ -646,6 +646,53 @@ public static function autoIncrementTypeMigrations(): iterable
             }
         }
     }
+
+    /**
+     * @param callable(AbstractSchemaManager):Comparator $comparatorFactory
+     *
+     * @dataProvider dataEmptyDiffRegardlessOfForeignTableQuotes
+     */
+    public function testEmptyDiffRegardlessOfForeignTableQuotes(
+        callable $comparatorFactory,
+        string $foreignTableName
+    ): void {
+        $this->connection->executeStatement('DROP SCHEMA IF EXISTS other_schema CASCADE');
+        $this->connection->executeStatement('CREATE SCHEMA other_schema');
+
+        $tableForeign = new Table($foreignTableName);
+        $tableForeign->addColumn('id', 'integer');
+        $tableForeign->setPrimaryKey(['id']);
+        $this->dropAndCreateTable($tableForeign);
+
+        $tableTo = new Table('other_schema.other_table');
+        $tableTo->addColumn('id', 'integer');
+        $tableTo->addColumn('user_id', 'integer');
+        $tableTo->setPrimaryKey(['id']);
+        $tableTo->addForeignKeyConstraint($tableForeign, ['user_id'], ['id']);
+        $this->dropAndCreateTable($tableTo);
+
+        $schemaFrom = $this->schemaManager->introspectSchema();
+        $tableFrom  = $schemaFrom->getTable('other_schema.other_table');
+
+        $diff = $comparatorFactory($this->schemaManager)->compareTables($tableFrom, $tableTo);
+        self::assertTrue($diff->isEmpty());
+    }
+
+    /** @return iterable<mixed[]> */
+    public static function dataEmptyDiffRegardlessOfForeignTableQuotes(): iterable
+    {
+        foreach (ComparatorTestUtils::comparatorProvider() as $comparatorArguments) {
+            foreach (
+                [
+                    'unquoted' => ['other_schema.user'],
+                    'partially quoted' => ['other_schema."user"'],
+                    'fully quoted' => ['"other_schema"."user"'],
+                ] as $testArguments
+            ) {
+                yield array_merge($comparatorArguments, $testArguments);
+            }
+        }
+    }
 }
 
 class MoneyType extends Type

diff --git a/tests/Schema/ForeignKeyConstraintTest.php b/tests/Schema/ForeignKeyConstraintTest.php
@@ -72,8 +72,12 @@ public static function getUnqualifiedForeignTableNameData(): iterable
     {
         return [
             ['schema.foreign_table', 'foreign_table'],
+            ['schema."foreign_table"', 'foreign_table'],
+            ['"schema"."foreign_table"', 'foreign_table'],
             ['foreign_table', 'foreign_table'],
             [new Table('schema.foreign_table'), 'foreign_table'],
+            [new Table('schema."foreign_table"'), 'foreign_table'],
+            [new Table('"schema"."foreign_table"'), 'foreign_table'],
             [new Table('foreign_table'), 'foreign_table'],
         ];
     }