🐛 Oracle: fix comment retrieval on table with reserved keyword name

doctrine · Feb 4, 2025 · d0fb9ec · d0fb9ec
1 parent 2b09bad
commit d0fb9ec
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/docs/en/reference/testing.rst b/docs/en/reference/testing.rst
@@ -79,7 +79,7 @@ then run the following command:
 
 .. code-block:: console
 
-    $ phpunit -c ci/github/pdo_mysql.xml
+    $ phpunit -c ci/github/phpunit/pdo_mysql.xml
 
 We do not currently have specific instructions on how to run a Database
 server, but we do recommend Docker as a convenient way to do so.

diff --git a/src/Schema/OracleSchemaManager.php b/src/Schema/OracleSchemaManager.php
@@ -512,13 +512,13 @@ protected function fetchTableOptionsByTable(string $databaseName, ?string $table
 
         $sql .= ' FROM ALL_TAB_COMMENTS WHERE ' . implode(' AND ', $conditions);
 
-        /** @var array<string,array<string,mixed>> $metadata */
-        $metadata = $this->_conn->executeQuery($sql, $params)
-            ->fetchAllAssociativeIndexed();
+        /** @var array<array{TABLE_NAME: string, COMMENTS: string|null}> $metadata */
+        $metadata = $this->_conn->executeQuery($sql, $params)->fetchAllAssociative();
 
         $tableOptions = [];
-        foreach ($metadata as $table => $data) {
-            $data = array_change_key_case($data, CASE_LOWER);
+        foreach ($metadata as $data) {
+            $data  = array_change_key_case($data, CASE_LOWER);
+            $table = $this->_getPortableTableDefinition($data);
 
             $tableOptions[$table] = [
                 'comment' => $data['comments'],

diff --git a/tests/Functional/Schema/SchemaManagerFunctionalTestCase.php b/tests/Functional/Schema/SchemaManagerFunctionalTestCase.php
@@ -1677,9 +1677,11 @@ public function testIntrospectReservedKeywordTableViaListTableDetails(): void
         $this->createReservedKeywordTables();
 
         $user = $this->schemaManager->introspectTable('"user"');
-        self::assertCount(2, $user->getColumns());
+        self::assertCount(3, $user->getColumns());
         self::assertCount(2, $user->getIndexes());
         self::assertCount(1, $user->getForeignKeys());
+        self::assertSame('table comment', $user->getComment());
+        self::assertSame('column comment', $user->getColumn('user')->getComment());
     }
 
     public function testIntrospectReservedKeywordTableViaListTables(): void
@@ -1690,9 +1692,11 @@ public function testIntrospectReservedKeywordTableViaListTables(): void
 
         $user = $this->findTableByName($tables, 'user');
         self::assertNotNull($user);
-        self::assertCount(2, $user->getColumns());
+        self::assertCount(3, $user->getColumns());
         self::assertCount(2, $user->getIndexes());
         self::assertCount(1, $user->getForeignKeys());
+        self::assertSame('table comment', $user->getComment());
+        self::assertSame('column comment', $user->getColumn('user')->getComment());
     }
 
     private function createReservedKeywordTables(): void
@@ -1705,7 +1709,9 @@ private function createReservedKeywordTables(): void
         $schema = new Schema();
 
         $user = $schema->createTable('user');
+        $user->setComment('table comment');
         $user->addColumn('id', Types::INTEGER);
+        $user->addColumn('user', Types::INTEGER)->setComment('column comment');
         $user->addColumn('group_id', Types::INTEGER);
         $user->setPrimaryKey(['id']);
         $user->addForeignKeyConstraint('group', ['group_id'], ['id']);