Merge pull request #6882 from morozov/cleanup-rename-index

Clean up Table::renameIndex() code

Author: morozov

src/Schema/Table.php

@@ -298,22 +298,25 @@ public function addUniqueIndex(array $columnNames, ?string $indexName = null, ar
      */
     public function renameIndex(string $oldName, ?string $newName = null): self
     {
-        $oldName           = $this->normalizeIdentifier($oldName);
-        $normalizedNewName = $this->normalizeIdentifier($newName);
-
-        if ($oldName === $normalizedNewName) {
-            return $this;
-        }
-
         if (! $this->hasIndex($oldName)) {
             throw IndexDoesNotExist::new($oldName, $this->_name);
         }
 
-        if ($this->hasIndex($normalizedNewName)) {
-            throw IndexAlreadyExists::new($normalizedNewName, $this->_name);
+        $normalizedOldName = $this->normalizeIdentifier($oldName);
+
+        if ($newName !== null) {
+            $normalizedNewName = $this->normalizeIdentifier($newName);
+
+            if ($normalizedOldName === $normalizedNewName) {
+                return $this;
+            }
+
+            if ($this->hasIndex($newName)) {
+                throw IndexAlreadyExists::new($newName, $this->_name);
+            }
         }
 
-        $oldIndex = $this->_indexes[$oldName];
+        $oldIndex = $this->_indexes[$normalizedOldName];
 
         if ($oldIndex->isPrimary()) {
             Deprecation::triggerIfCalledFromOutside(
@@ -329,7 +332,7 @@ public function renameIndex(string $oldName, ?string $newName = null): self
             return $this->setPrimaryKey($oldIndex->getColumns(), $newName ?? null);
         }
 
-        unset($this->_indexes[$oldName]);
+        unset($this->_indexes[$normalizedOldName]);
 
         if ($oldIndex->isUnique()) {
             return $this->addUniqueIndex($oldIndex->getColumns(), $newName, $oldIndex->getOptions());
@@ -944,12 +947,8 @@ protected function _addForeignKeyConstraint(ForeignKeyConstraint $constraint): s
      *
      * Trims quotes and lowercases the given identifier.
      */
-    private function normalizeIdentifier(?string $identifier): string
+    private function normalizeIdentifier(string $identifier): string
     {
-        if ($identifier === null) {
-            return '';
-        }
-
         return $this->trimQuotes(strtolower($identifier));
     }
 

tests/Schema/TableTest.php

@@ -8,6 +8,7 @@
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Platforms\SQLitePlatform;
 use Doctrine\DBAL\Schema\Column;
+use Doctrine\DBAL\Schema\Exception\IndexDoesNotExist;
 use Doctrine\DBAL\Schema\Exception\InvalidState;
 use Doctrine\DBAL\Schema\Exception\PrimaryKeyAlreadyExists;
 use Doctrine\DBAL\Schema\ForeignKeyConstraint;
@@ -776,6 +777,14 @@ public function testRenameIndex(): void
         self::assertTrue($table->hasIndex('UNIQ_D87F7E0C76FF8CAA78240498'));
     }
 
+    public function testRenameNonExistingIndexToTheSameName(): void
+    {
+        $table = new Table('test');
+
+        $this->expectException(IndexDoesNotExist::class);
+        $table->renameIndex('test', 'test');
+    }
+
     public function testKeepsIndexOptionsOnRenamingRegularIndex(): void
     {
         $table = new Table('foo');