[Messenger][Doctrine] Add test, oracle sequence suffixed with _seq

clem-rwan · clem-rwan · commit 18eeb648cd60 · 2024-10-14T16:49:45.000+02:00
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php
@@ -698,4 +698,21 @@ class_exists(SQLServerPlatform::class) && !class_exists(SQLServer2012Platform::c
             ];
         }
     }
+
+    public function testConfigureSchemaOracleSequenceNameSuffixed()
+    {
+        $driverConnection = $this->createMock(DBALConnection::class);
+        $driverConnection->method('getDatabasePlatform')->willReturn(new OraclePlatform());
+        $schema = new Schema();
+
+        $connection = new Connection(['table_name' => 'messenger_messages'], $driverConnection);
+        $connection->configureSchema($schema, $driverConnection, fn () => true);
+        
+        $expectedSuffix = '_seq';
+        $sequences = $schema->getSequences();
+        $this->assertCount(1, $sequences);
+        $sequence = array_pop($sequences);
+        $sequenceNameSuffix = substr($sequence->getName(), -strlen($expectedSuffix));
+        $this->assertSame($expectedSuffix, $sequenceNameSuffix);
+    }
 }
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
@@ -53,6 +53,8 @@ class Connection implements ResetInterface
         'auto_setup' => true,
     ];
 
+    private const ORACLE_SEQUENCES_SUFFIX = '_seq';
+
     /**
      * Configuration of the connection.
      *
@@ -471,7 +473,7 @@ private function executeInsert(string $sql, array $parameters = [], array $types
                     throw new TransportException('no id was returned by PostgreSQL from RETURNING clause.');
                 }
             } elseif ($this->driverConnection->getDatabasePlatform() instanceof OraclePlatform) {
-                $sequenceName = $this->configuration['table_name'].'_seq';
+                $sequenceName = $this->configuration['table_name'].self::ORACLE_SEQUENCES_SUFFIX;
 
                 $this->driverConnection->executeStatement($sql, $parameters, $types);
 
@@ -542,9 +544,9 @@ private function addTableToSchema(Schema $schema): void
 
         // We need to create a sequence for Oracle and set the id column to get the correct nextval
         if ($this->driverConnection->getDatabasePlatform() instanceof OraclePlatform) {
-            $idColumn->setDefault($this->configuration['table_name'].'_seq'.'.nextval');
+            $idColumn->setDefault($this->configuration['table_name'].self::ORACLE_SEQUENCES_SUFFIX.'.nextval');
 
-            $schema->createSequence($this->configuration['table_name'].'_seq');
+            $schema->createSequence($this->configuration['table_name'].self::ORACLE_SEQUENCES_SUFFIX);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,8 @@ class Connection implements ResetInterface`
`53`	`53`	`'auto_setup' => true,`
`54`	`54`	`];`
`55`	`55`
	`56`	`+ private const ORACLE_SEQUENCES_SUFFIX = '_seq';`
	`57`	`+`
`56`	`58`	`/**`
`57`	`59`	`* Configuration of the connection.`
`58`	`60`	`*`
`@@ -471,7 +473,7 @@ private function executeInsert(string $sql, array $parameters = [], array $types`
`471`	`473`	`throw new TransportException('no id was returned by PostgreSQL from RETURNING clause.');`
`472`	`474`	`}`
`473`	`475`	`} elseif ($this->driverConnection->getDatabasePlatform() instanceof OraclePlatform) {`
`474`		`- $sequenceName = $this->configuration['table_name'].'_seq';`
	`476`	`+ $sequenceName = $this->configuration['table_name'].self::ORACLE_SEQUENCES_SUFFIX;`
`475`	`477`
`476`	`478`	`$this->driverConnection->executeStatement($sql, $parameters, $types);`
`477`	`479`
`@@ -542,9 +544,9 @@ private function addTableToSchema(Schema $schema): void`
`542`	`544`
`543`	`545`	`// We need to create a sequence for Oracle and set the id column to get the correct nextval`
`544`	`546`	`if ($this->driverConnection->getDatabasePlatform() instanceof OraclePlatform) {`
`545`		`- $idColumn->setDefault($this->configuration['table_name'].'_seq'.'.nextval');`
	`547`	`+ $idColumn->setDefault($this->configuration['table_name'].self::ORACLE_SEQUENCES_SUFFIX.'.nextval');`
`546`	`548`
`547`		`- $schema->createSequence($this->configuration['table_name'].'_seq');`
	`549`	`+ $schema->createSequence($this->configuration['table_name'].self::ORACLE_SEQUENCES_SUFFIX);`
`548`	`550`	`}`
`549`	`551`	`}`
`550`	`552`