Quote parts of the table name

In aa141bf, I wrongly assumed that
$tableName would never contain a dot as I was not able to write a test
that caused that to happen.

The secret recipe appears to be to define a schema and to quote the
table name.

To fix it for the table name, I am calling quoteSingleIdentifier()
before doing the concatenation between schema name and table name.

To fix it for the sequence name, which seems only useful when using DBAL
3 for some reason, I reuse some of the logic of the deprecated method.

Fixes #12041

Author: greg0ire

src/Mapping/DefaultQuoteStrategy.php

@@ -10,8 +10,11 @@
 use function array_map;
 use function array_merge;
 use function assert;
+use function explode;
+use function implode;
 use function is_numeric;
 use function preg_replace;
+use function sprintf;
 use function substr;
 
 /**
@@ -38,7 +41,13 @@ public function getTableName(ClassMetadata $class, AbstractPlatform $platform):
         $tableName = $class->table['name'];
 
         if (! empty($class->table['schema'])) {
-            $tableName = $class->table['schema'] . '.' . $class->table['name'];
+            return isset($class->table['quoted'])
+                ? sprintf(
+                    '%s.%s',
+                    $platform->quoteSingleIdentifier($class->table['schema']),
+                    $platform->quoteSingleIdentifier($tableName),
+                )
+                : $class->table['schema'] . '.' . $class->table['name'];
         }
 
         return isset($class->table['quoted'])
@@ -52,7 +61,10 @@ public function getTableName(ClassMetadata $class, AbstractPlatform $platform):
     public function getSequenceName(array $definition, ClassMetadata $class, AbstractPlatform $platform): string
     {
         return isset($definition['quoted'])
-            ? $platform->quoteSingleIdentifier($definition['sequenceName'])
+            ? implode('.', array_map(
+                static fn (string $part) => $platform->quoteSingleIdentifier($part),
+                explode('.', $definition['sequenceName']),
+            ))
             : $definition['sequenceName'];
     }
 

tests/Tests/ORM/Functional/Ticket/DDC2825Test.php

@@ -31,8 +31,12 @@ protected function setUp(): void
     }
 
     #[DataProvider('getTestedClasses')]
-    public function testClassSchemaMappingsValidity(string $className, string $expectedSchemaName, string $expectedTableName): void
-    {
+    public function testClassSchemaMappingsValidity(
+        string $className,
+        string $expectedSchemaName,
+        string $expectedTableName,
+        bool $isQuoted,
+    ): void {
         $classMetadata   = $this->_em->getClassMetadata($className);
         $platform        = $this->_em->getConnection()->getDatabasePlatform();
         $quotedTableName = $this->_em->getConfiguration()->getQuoteStrategy()->getTableName($classMetadata, $platform);
@@ -41,13 +45,22 @@ public function testClassSchemaMappingsValidity(string $className, string $expec
         self::assertEquals($expectedTableName, $classMetadata->table['name']);
         self::assertEquals($expectedSchemaName, $classMetadata->table['schema']);
 
-        $fullTableName = sprintf('%s.%s', $expectedSchemaName, $expectedTableName);
+        $fullTableName = sprintf(
+            $isQuoted ? '"%s"."%s"' : '%s.%s',
+            $expectedSchemaName,
+            $expectedTableName,
+        );
 
         self::assertEquals($fullTableName, $quotedTableName);
 
         // Checks sequence name validity
         self::assertEquals(
-            $fullTableName . '_' . $classMetadata->getSingleIdentifierColumnName() . '_seq',
+            sprintf(
+                '%s.%s_%s_seq',
+                $expectedSchemaName,
+                $expectedTableName,
+                $classMetadata->getSingleIdentifierColumnName(),
+            ),
             $classMetadata->getSequenceName($platform),
         );
     }
@@ -72,9 +85,10 @@ public function testPersistenceOfEntityWithSchemaMapping(string $className): voi
     public static function getTestedClasses(): array
     {
         return [
-            [ExplicitSchemaAndTable::class, 'explicit_schema', 'explicit_table'],
-            [SchemaAndTableInTableName::class, 'implicit_schema', 'implicit_table'],
-            [DDC2825ClassWithImplicitlyDefinedSchemaAndQuotedTableName::class, 'myschema', 'order'],
+            [ExplicitSchemaAndTable::class, 'explicit_schema', 'explicit_table', false],
+            [SchemaAndTableInTableName::class, 'implicit_schema', 'implicit_table', false],
+            [DDC2825ClassWithImplicitlyDefinedSchemaAndQuotedTableName::class, 'myschema', 'order', false],
+            [File::class, 'yourschema', 'file', true],
         ];
     }
 }
@@ -89,3 +103,13 @@ class DDC2825ClassWithImplicitlyDefinedSchemaAndQuotedTableName
     #[ORM\Column(type: 'integer')]
     public $id;
 }
+
+#[ORM\Entity]
+#[ORM\Table(name: '`file`', schema: 'yourschema')]
+class File
+{
+    #[ORM\Id]
+    #[ORM\Column]
+    #[ORM\GeneratedValue]
+    public int $id;
+}