Merge pull request #31221 from nextcloud/feat/dont_create_oc_cards_index_if_it_exists

Don't create cards_abiduri it if already exists

1 files changed, 9 insertions, 5 deletions

diff --git a/core/Command/Db/AddMissingIndices.php b/core/Command/Db/AddMissingIndices.php
index f1dba2f4c31..a4379ffacc3 100644
--- a/core/Command/Db/AddMissingIndices.php
+++ b/core/Command/Db/AddMissingIndices.php
@@ -258,11 +258,15 @@ class AddMissingIndices extends Command {
 			$table = $schema->getTable('cards');
 
 			if ($table->hasIndex('addressbookid_uri_index')) {
-				$output->writeln('<info>Renaming addressbookid_uri_index index to  to the cards table, this can take some time...</info>');
-
-				foreach ($table->getIndexes() as $index) {
-					if ($index->getColumns() === ['addressbookid', 'uri']) {
-						$table->renameIndex('addressbookid_uri_index', 'cards_abiduri');
+				if ($table->hasIndex('cards_abiduri')) {
+					$table->dropIndex('addressbookid_uri_index');
+				} else {
+					$output->writeln('<info>Renaming addressbookid_uri_index index to cards_abiduri in the cards table, this can take some time...</info>');
+
+					foreach ($table->getIndexes() as $index) {
+						if ($index->getColumns() === ['addressbookid', 'uri']) {
+							$table->renameIndex('addressbookid_uri_index', 'cards_abiduri');
+						}
 					}
 				}