Merge pull request #4288 from nextcloud/fix/avoid-old-migration

Replace possibly incorrect migrations by dummy migration to avoid execution

Author: dartcafe

appinfo/info.xml

@@ -32,6 +32,11 @@
     <job>OCA\Polls\Cron\JanitorCron</job>
     <job>OCA\Polls\Cron\AutoReminderCron</job>
   </background-jobs>
+  <repair-steps>
+      <post-migration>
+          <step>OCA\Polls\Migration\RepairSteps\UpdateHashes</step>
+      </post-migration>
+  </repair-steps>
   <commands>
     <command>OCA\Polls\Command\Db\CleanMigrations</command>
     <command>OCA\Polls\Command\Db\CreateIndices</command>

lib/Command/Db/CleanMigrations.php

@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V3\TableManager;
+use OCA\Polls\Db\V4\TableManager;
 use OCP\IDBConnection;
 
 /**

lib/Command/Db/CreateIndices.php

@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V3\IndexManager;
+use OCA\Polls\Db\V4\IndexManager;
 use OCP\IDBConnection;
 
 /**

lib/Command/Db/FixDB.php

@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V3\TableManager;
+use OCA\Polls\Db\V4\TableManager;
 use OCP\IDBConnection;
 
 /**

lib/Command/Db/Purge.php

@@ -9,7 +9,7 @@
 namespace OCA\Polls\Command\Db;
 
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V3\TableManager;
+use OCA\Polls\Db\V4\TableManager;
 use OCP\IDBConnection;
 
 /**

lib/Command/Db/Rebuild.php

@@ -9,8 +9,8 @@
 namespace OCA\Polls\Command\Db;
 
 use Doctrine\DBAL\Schema\Schema;
-use OCA\Polls\Db\V3\TableManager;
-use OCA\Polls\Db\V3\IndexManager;
+use OCA\Polls\Db\V4\TableManager;
+use OCA\Polls\Db\V4\IndexManager;
 use OCA\Polls\Command\Command;
 use OCP\IDBConnection;
 
@@ -68,7 +68,7 @@ protected function runCommands(): int {
 
 		$this->printComment('Step 5. Validate and fix records');
 		$this->removeOrphaned();
-		$this->migrateOptionsToHash();
+		$this->updateHashes();
 		$this->deleteAllDuplicates();
 		$this->setLastInteraction();
 
@@ -123,9 +123,9 @@ private function createOrUpdateSchema(): void {
 	/**
 	 * Add or update hash for votes and options
 	 */
-	private function migrateOptionsToHash(): void {
+	private function updateHashes(): void {
 		$this->printComment(' - Add or update hashes');
-		$messages = $this->tableManager->migrateOptionsToHash();
+		$messages = $this->tableManager->updateHashes();
 		$this->printInfo($messages, '   ');
 	}
 

lib/Command/Db/RemoveFKConstraints.php

@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V3\IndexManager;
+use OCA\Polls\Db\V4\IndexManager;
 use OCP\IDBConnection;
 
 /**

lib/Command/Db/RemoveOptionalIndices.php

@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V3\IndexManager;
+use OCA\Polls\Db\V4\IndexManager;
 use OCP\IDBConnection;
 
 /**

lib/Command/Db/RemoveUniqueIndices.php

@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V3\IndexManager;
+use OCA\Polls\Db\V4\IndexManager;
 use OCP\IDBConnection;
 
 /**

lib/Command/Db/ResetWatch.php

@@ -10,10 +10,10 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V3\IndexManager;
-use OCA\Polls\Db\V3\TableManager;
+use OCA\Polls\Db\V4\IndexManager;
+use OCA\Polls\Db\V4\TableManager;
 use OCA\Polls\Db\Watch;
-use OCA\Polls\Migration\V3\TableSchema;
+use OCA\Polls\Migration\V4\TableSchema;
 use OCP\IDBConnection;
 
 /**