PostgreSQL: Add schema to DROP INDEX query when table not in default …

…schema
doctrine · Feb 14, 2025 · 368e8a2 · 368e8a2
1 parent 2b09bad
commit 368e8a2
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 0 deletions.
diff --git a/src/Platforms/PostgreSQLPlatform.php b/src/Platforms/PostgreSQLPlatform.php
@@ -833,6 +833,12 @@ public function getDropIndexSQL($index, $table = null)
             return $this->getDropConstraintSQL($constraintName, $table);
         }
 
+        $tableName = $table instanceof Table ? $table->getQuotedName($this) : $table;
+        if ($tableName !== null && strpos($tableName, '.') !== false) {
+            [$schema] = explode('.', $tableName);
+            $index    = $schema . '.' . ($index instanceof Index ? $index->getQuotedName($this) : $index);
+        }
+
         return parent::getDropIndexSQL($index, $table);
     }
 

diff --git a/tests/Functional/Schema/PostgreSQLSchemaManagerTest.php b/tests/Functional/Schema/PostgreSQLSchemaManagerTest.php
@@ -646,6 +646,57 @@ public static function autoIncrementTypeMigrations(): iterable
             }
         }
     }
+
+    /**
+     * @param callable(AbstractSchemaManager):Comparator $comparatorFactory
+     *
+     * @dataProvider dataDropIndexInAnotherSchema
+     */
+    public function testDropIndexInAnotherSchema(
+        callable $comparatorFactory,
+        string $tableName,
+        string $expectedDropIndexSQL
+    ): void {
+        $this->connection->executeStatement('CREATE SCHEMA IF NOT EXISTS other_schema');
+        $this->connection->executeStatement('CREATE SCHEMA IF NOT EXISTS "case"');
+
+        $tableFrom = new Table($tableName);
+        $tableFrom->addColumn('id', Types::INTEGER);
+        $tableFrom->addColumn('name', Types::TEXT);
+        $tableFrom->addUniqueIndex(['name'], 'name_unique_index');
+        $this->dropAndCreateTable($tableFrom);
+
+        $tableTo = clone $tableFrom;
+        $tableTo->dropIndex('name_unique_index');
+
+        $diff = $comparatorFactory($this->schemaManager)->compareTables($tableFrom, $tableTo);
+        self::assertNotFalse($diff);
+        self::assertSame(
+            [$expectedDropIndexSQL],
+            $this->connection->getDatabasePlatform()->getAlterTableSQL($diff),
+        );
+
+        $this->schemaManager->alterTable($diff);
+        $tableFinal = $this->schemaManager->introspectTable($tableName);
+        self::assertEmpty($tableFinal->getIndexes());
+    }
+
+    /** @return iterable<mixed[]> */
+    public static function dataDropIndexInAnotherSchema(): iterable
+    {
+        foreach (ComparatorTestUtils::comparatorProvider() as $comparatorScenario => $comparatorArguments) {
+            foreach (
+                [
+                    'default schema' => ['table', 'DROP INDEX name_unique_index'],
+                    'unquoted schema' => ['other_schema.table', 'DROP INDEX other_schema.name_unique_index'],
+                    'quoted schema' => ['"other_schema".table', 'DROP INDEX "other_schema".name_unique_index'],
+                    'reserved schema' => ['case.table', 'DROP INDEX "case".name_unique_index'],
+                ] as $testScenario => $testArguments
+            ) {
+                yield $comparatorScenario . ' - ' . $testScenario => array_merge($comparatorArguments, $testArguments);
+            }
+        }
+    }
 }
 
 class MoneyType extends Type