Merge pull request #6971 from morozov/table-editor-omit-implicit-indexes

Omit implicit indexes in Table::edit()

Author: morozov

src/Schema/Table.php

@@ -23,6 +23,7 @@
 use Doctrine\Deprecations\Deprecation;
 use LogicException;
 
+use function array_diff_key;
 use function array_map;
 use function array_merge;
 use function array_values;
@@ -1002,7 +1003,7 @@ public function edit(): TableEditor
         $editor = self::editor()
             ->setName($this->getObjectName())
             ->setColumns(...array_values($this->_columns))
-            ->setIndexes(...array_values($this->_indexes))
+            ->setIndexes(...array_values(array_diff_key($this->_indexes, $this->implicitIndexNames)))
             ->setPrimaryKeyConstraint($this->primaryKeyConstraint)
             ->setUniqueConstraints(...array_values($this->uniqueConstraints))
             ->setForeignKeyConstraints(...array_values($this->_fkConstraints));

tests/Schema/TableTest.php

@@ -13,6 +13,7 @@
 use Doctrine\DBAL\Schema\Exception\PrimaryKeyAlreadyExists;
 use Doctrine\DBAL\Schema\ForeignKeyConstraint;
 use Doctrine\DBAL\Schema\Index;
+use Doctrine\DBAL\Schema\Index\IndexType;
 use Doctrine\DBAL\Schema\Name\Identifier;
 use Doctrine\DBAL\Schema\PrimaryKeyConstraint;
 use Doctrine\DBAL\Schema\SchemaException;
@@ -716,7 +717,15 @@ public function testAddingFulfillingUniqueIndexOverridesImplicitForeignKeyConstr
 
         self::assertCount(1, $localTable->getIndexes());
 
-        $localTable->addUniqueIndex(['id'], 'explicit_idx');
+        $localTable = $localTable->edit()
+            ->addIndex(
+                Index::editor()
+                    ->setUnquotedName('explicit_idx')
+                    ->setType(IndexType::UNIQUE)
+                    ->setUnquotedColumnNames('id')
+                    ->create(),
+            )
+            ->create();
 
         self::assertCount(1, $localTable->getIndexes());
         self::assertTrue($localTable->hasIndex('explicit_idx'));