Merge pull request #4620 from nextcloud/fix/index-creation

dartcafe · web-flow · commit 0ab6f6993b9b · 2026-04-18T12:08:07.000+02:00
Fix index creation
diff --git a/lib/Command/Db/CleanMigrations.php b/lib/Command/Db/CleanMigrations.php
@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V6\TableManager;
+use OCA\Polls\Db\V7\TableManager;
 use OCP\IDBConnection;
 
 /**
diff --git a/lib/Command/Db/CreateIndices.php b/lib/Command/Db/CreateIndices.php
@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V6\IndexManager;
+use OCA\Polls\Db\V7\IndexManager;
 use OCP\IDBConnection;
 
 /**
diff --git a/lib/Command/Db/FixDB.php b/lib/Command/Db/FixDB.php
@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V6\TableManager;
+use OCA\Polls\Db\V7\TableManager;
 use OCP\IDBConnection;
 
 /**
diff --git a/lib/Command/Db/Purge.php b/lib/Command/Db/Purge.php
@@ -9,7 +9,7 @@
 namespace OCA\Polls\Command\Db;
 
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V6\TableManager;
+use OCA\Polls\Db\V7\TableManager;
 use OCP\IDBConnection;
 
 /**
diff --git a/lib/Command/Db/Rebuild.php b/lib/Command/Db/Rebuild.php
@@ -9,8 +9,8 @@
 namespace OCA\Polls\Command\Db;
 
 use Doctrine\DBAL\Schema\Schema;
-use OCA\Polls\Db\V6\TableManager;
-use OCA\Polls\Db\V6\IndexManager;
+use OCA\Polls\Db\V7\TableManager;
+use OCA\Polls\Db\V7\IndexManager;
 use OCA\Polls\Command\Command;
 use OCP\IDBConnection;
 
diff --git a/lib/Command/Db/RemoveFKConstraints.php b/lib/Command/Db/RemoveFKConstraints.php
@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V6\IndexManager;
+use OCA\Polls\Db\V7\IndexManager;
 use OCP\IDBConnection;
 
 /**
diff --git a/lib/Command/Db/RemoveOptionalIndices.php b/lib/Command/Db/RemoveOptionalIndices.php
@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V6\IndexManager;
+use OCA\Polls\Db\V7\IndexManager;
 use OCP\IDBConnection;
 
 /**
diff --git a/lib/Command/Db/RemoveUniqueIndices.php b/lib/Command/Db/RemoveUniqueIndices.php
@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V6\IndexManager;
+use OCA\Polls\Db\V7\IndexManager;
 use OCP\IDBConnection;
 
 /**
diff --git a/lib/Command/Db/ResetWatch.php b/lib/Command/Db/ResetWatch.php
@@ -10,10 +10,10 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V6\IndexManager;
-use OCA\Polls\Db\V6\TableManager;
+use OCA\Polls\Db\V7\IndexManager;
+use OCA\Polls\Db\V7\TableManager;
 use OCA\Polls\Db\Watch;
-use OCA\Polls\Migration\V6\TableSchema;
+use OCA\Polls\Migration\V7\TableSchema;
 use OCP\IDBConnection;
 
 /**
diff --git a/lib/Cron/JanitorCron.php b/lib/Cron/JanitorCron.php
@@ -16,7 +16,7 @@
 use OCA\Polls\Db\OptionMapper;
 use OCA\Polls\Db\PollMapper;
 use OCA\Polls\Db\ShareMapper;
-use OCA\Polls\Db\V6\TableManager;
+use OCA\Polls\Db\V7\TableManager;
 use OCA\Polls\Db\VoteMapper;
 use OCA\Polls\Model\Settings\AppSettings;
 use OCP\AppFramework\Utility\ITimeFactory;
diff --git a/lib/Db/V7/DbManager.php b/lib/Db/V7/DbManager.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Polls\Db\V6;
+namespace OCA\Polls\Db\V7;
 
 use Doctrine\DBAL\Schema\Schema;
 use Exception;
diff --git a/lib/Db/V7/IndexManager.php b/lib/Db/V7/IndexManager.php
@@ -6,11 +6,11 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Polls\Db\V6;
+namespace OCA\Polls\Db\V7;
 
 use Doctrine\DBAL\Schema\Exception\IndexDoesNotExist;
 use Exception;
-use OCA\Polls\Migration\V6\TableSchema;
+use OCA\Polls\Migration\V7\TableSchema;
 use OCP\IConfig;
 use OCP\IDBConnection;
 use Psr\Log\LoggerInterface;
@@ -27,6 +27,12 @@ public function __construct(
 		parent::__construct($config, $connection, $logger);
 	}
 
+	private function columnsMatch(array $existing, array $expected): bool {
+		sort($existing);
+		sort($expected);
+		return $existing === $expected;
+	}
+
 	/**
 	 * Create unique indices
 	 * Unique indices are crucial for the correct operation of the polls app.
@@ -36,10 +42,44 @@ public function __construct(
 	 */
 	public function createUniqueIndices(): array {
 		$messages = [];
+		$this->needsSchema();
 
 		foreach (TableSchema::UNIQUE_INDICES as $tableName => $uniqueIndices) {
+			$prefixedTable = $this->getTableName($tableName);
+
+			if (!$this->schema->hasTable($prefixedTable)) {
+				continue;
+			}
+
+			$table = $this->schema->getTable($prefixedTable);
+
 			foreach ($uniqueIndices as $name => $definition) {
-				$messages[] = $this->createIndex($tableName, $name, $definition['columns'], true);
+				$targetColumns = $definition['columns'];
+				$existsByName = $table->hasIndex($name);
+				$definitionMatches = $existsByName && $this->columnsMatch($table->getIndex($name)->getColumns(), $targetColumns);
+
+				// 1+2: correct name, correct columns → skip
+				if ($existsByName && $definitionMatches) {
+					$messages[] = 'Unique index ' . $name . ' already exists in ' . $tableName;
+					continue;
+				}
+
+				// 1 true, 2 false: correct name, wrong columns → drop and recreate
+				if ($existsByName) {
+					$table->dropIndex($name);
+					$messages[] = 'Dropped unique index ' . $name . ' from ' . $tableName . ' (definition mismatch)';
+				} else {
+					// 1 false, 3: different name, same columns → drop and recreate with correct name
+					foreach ($table->getIndexes() as $index) {
+						if ($index->isUnique() && $this->columnsMatch($index->getColumns(), $targetColumns)) {
+							$messages[] = 'Dropped unique index ' . $index->getName() . ' from ' . $tableName . ' (renamed to ' . $name . ')';
+							$table->dropIndex($index->getName());
+							break;
+						}
+					}
+				}
+
+				$messages[] = $this->createIndex($tableName, $name, $targetColumns, true);
 			}
 		}
 		return $messages;
@@ -98,6 +138,15 @@ public function createForeignKeyConstraint(string $parentTableName, string $chil
 		$parentTable = $this->schema->getTable($parentTableName);
 		$childTable = $this->schema->getTable($childTableName);
 
+		foreach ($childTable->getForeignKeys() as $fk) {
+			if ($fk->getForeignTableName() === $parentTableName
+				&& $fk->getLocalColumns() === [$constraintColumn]
+				&& $fk->getForeignColumns() === ['id']
+			) {
+				return 'Foreign key ' . $childTableName . '[' . $constraintColumn . '] -> ' . $parentTableName . '[id] already exists';
+			}
+		}
+
 		$childTable->addForeignKeyConstraint($parentTable, [$constraintColumn], ['id'], ['onDelete' => 'CASCADE']);
 		return 'Added ' . $parentTableName . '[' . $constraintColumn . '] <- ' . $childTableName . '[id]';
 	}
diff --git a/lib/Db/V7/TableManager.php b/lib/Db/V7/TableManager.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Polls\Db\V6;
+namespace OCA\Polls\Db\V7;
 
 use Doctrine\DBAL\Types\Type;
 use Exception;
@@ -20,7 +20,7 @@
 use OCA\Polls\Db\Watch;
 use OCA\Polls\Exceptions\PreconditionException;
 use OCA\Polls\Helper\Hash;
-use OCA\Polls\Migration\V6\TableSchema;
+use OCA\Polls\Migration\V7\TableSchema;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IConfig;
 use OCP\IDBConnection;
@@ -416,6 +416,11 @@ private function deleteDuplicates(string $table, array $columns):int {
 		$i = 0;
 
 		foreach ($columns as $column) {
+			if (!$this->schema->getTable($this->dbPrefix . $table)->hasColumn($column)) {
+				$this->logger->warning('Column {column} does not exist in table {table} - cannot check for duplicates based on this column', ['column' => $column, 'table' => $this->dbPrefix . $table]);
+				return 0;
+			}
+
 			if ($i > 0) {
 				$selection->andWhere($qb->expr()->eq('t1.' . $column, 't2.' . $column));
 			} else {
diff --git a/lib/Listener/AddMissingIndicesListener.php b/lib/Listener/AddMissingIndicesListener.php
@@ -8,7 +8,7 @@
 
 namespace OCA\Polls\Listener;
 
-use OCA\Polls\Migration\V6\TableSchema;
+use OCA\Polls\Migration\V7\TableSchema;
 use OCP\DB\Events\AddMissingIndicesEvent;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
diff --git a/lib/Migration/FixVotes.php b/lib/Migration/FixVotes.php
@@ -10,7 +10,7 @@
 namespace OCA\Polls\Migration;
 
 use Doctrine\DBAL\Schema\Schema;
-use OCA\Polls\Db\V6\TableManager;
+use OCA\Polls\Db\V7\TableManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/CleanTables.php b/lib/Migration/RepairSteps/CleanTables.php
@@ -12,7 +12,7 @@
 use Doctrine\DBAL\Schema\Schema;
 use Exception;
 use OCA\Polls\Db\Poll;
-use OCA\Polls\Db\V6\TableManager;
+use OCA\Polls\Db\V7\TableManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/CreateIndices.php b/lib/Migration/RepairSteps/CreateIndices.php
@@ -11,7 +11,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Db\Share;
-use OCA\Polls\Db\V6\IndexManager;
+use OCA\Polls\Db\V7\IndexManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/CreateTables.php b/lib/Migration/RepairSteps/CreateTables.php
@@ -10,7 +10,7 @@
 namespace OCA\Polls\Migration\RepairSteps;
 
 use Doctrine\DBAL\Schema\Schema;
-use OCA\Polls\Db\V6\TableManager;
+use OCA\Polls\Db\V7\TableManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/DropOrphanedColumns.php b/lib/Migration/RepairSteps/DropOrphanedColumns.php
@@ -10,7 +10,7 @@
 namespace OCA\Polls\Migration\RepairSteps;
 
 use Doctrine\DBAL\Schema\Schema;
-use OCA\Polls\Db\V6\TableManager;
+use OCA\Polls\Db\V7\TableManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/DropOrphanedTables.php b/lib/Migration/RepairSteps/DropOrphanedTables.php
@@ -10,7 +10,7 @@
 namespace OCA\Polls\Migration\RepairSteps;
 
 use Doctrine\DBAL\Schema\Schema;
-use OCA\Polls\Db\V6\TableManager;
+use OCA\Polls\Db\V7\TableManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/FixNullish.php b/lib/Migration/RepairSteps/FixNullish.php
@@ -9,7 +9,7 @@
 
 namespace OCA\Polls\Migration\RepairSteps;
 
-use OCA\Polls\Db\V6\TableManager;
+use OCA\Polls\Db\V7\TableManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/Install.php b/lib/Migration/RepairSteps/Install.php
@@ -10,7 +10,7 @@
 namespace OCA\Polls\Migration\RepairSteps;
 
 use Doctrine\DBAL\Schema\Schema;
-use OCA\Polls\Db\V6\IndexManager;
+use OCA\Polls\Db\V7\IndexManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/MigratePublicToOpen.php b/lib/Migration/RepairSteps/MigratePublicToOpen.php
@@ -9,7 +9,7 @@
 
 namespace OCA\Polls\Migration\RepairSteps;
 
-use OCA\Polls\Db\V6\TableManager;
+use OCA\Polls\Db\V7\TableManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/RemoveIndices.php b/lib/Migration/RepairSteps/RemoveIndices.php
@@ -9,7 +9,7 @@
 namespace OCA\Polls\Migration\RepairSteps;
 
 use Doctrine\DBAL\Schema\Schema;
-use OCA\Polls\Db\V6\IndexManager;
+use OCA\Polls\Db\V7\IndexManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/RemoveObsoleteMigrations.php b/lib/Migration/RepairSteps/RemoveObsoleteMigrations.php
@@ -9,7 +9,7 @@
 namespace OCA\Polls\Migration\RepairSteps;
 
 use Doctrine\DBAL\Schema\Schema;
-use OCA\Polls\Db\V6\TableManager;
+use OCA\Polls\Db\V7\TableManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/SetLastInteraction.php b/lib/Migration/RepairSteps/SetLastInteraction.php
@@ -9,7 +9,7 @@
 
 namespace OCA\Polls\Migration\RepairSteps;
 
-use OCA\Polls\Db\V6\TableManager;
+use OCA\Polls\Db\V7\TableManager;
 use OCA\Polls\Db\WatchMapper;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
diff --git a/lib/Migration/RepairSteps/UpdateHashes.php b/lib/Migration/RepairSteps/UpdateHashes.php
@@ -9,7 +9,7 @@
 
 namespace OCA\Polls\Migration\RepairSteps;
 
-use OCA\Polls\Db\V6\TableManager;
+use OCA\Polls\Db\V7\TableManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/RepairSteps/UpdateInteraction.php b/lib/Migration/RepairSteps/UpdateInteraction.php
@@ -9,7 +9,7 @@
 
 namespace OCA\Polls\Migration\RepairSteps;
 
-use OCA\Polls\Db\V6\TableManager;
+use OCA\Polls\Db\V7\TableManager;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
diff --git a/lib/Migration/V7/TableSchema.php b/lib/Migration/V7/TableSchema.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Polls\Migration\V6;
+namespace OCA\Polls\Migration\V7;
 
 use OCA\Polls\Db\Comment;
 use OCA\Polls\Db\Log;
diff --git a/lib/Migration/Version080301Date20250822153002.php b/lib/Migration/Version080301Date20250822153002.php
@@ -8,8 +8,8 @@
 
 namespace OCA\Polls\Migration;
 
-use OCA\Polls\Db\V6\IndexManager;
-use OCA\Polls\Db\V6\TableManager;
+use OCA\Polls\Db\V7\IndexManager;
+use OCA\Polls\Db\V7\TableManager;
 use OCP\DB\ISchemaWrapper;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
diff --git a/lib/Migration/Version080307Date20250826231102.php b/lib/Migration/Version080307Date20250826231102.php
@@ -9,8 +9,8 @@
 namespace OCA\Polls\Migration;
 
 use OCA\Polls\Db\Share;
-use OCA\Polls\Db\V6\IndexManager;
-use OCA\Polls\Db\V6\TableManager;
+use OCA\Polls\Db\V7\IndexManager;
+use OCA\Polls\Db\V7\TableManager;
 use OCP\DB\ISchemaWrapper;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
diff --git a/lib/Migration/Version090000Date20260302212000.php b/lib/Migration/Version090000Date20260302212000.php
