Merge pull request #4160 from nextcloud/hotfix/avoid-broken-install-8.1.0

Hotfix to avoid broken install of v8.1.0

Author: dartcafe

appinfo/info.xml

@@ -4,7 +4,7 @@
   <name>Polls</name>
   <summary>A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access.</summary>
   <description>A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).</description>
-  <version>8.1.0</version>
+  <version>8.1.2</version>
   <licence>agpl</licence>
   <author>Vinzenz Rosenkranz</author>
   <author>René Gieling</author>

lib/Migration/RepairSteps/DeleteInvalidRecords.php

@@ -10,6 +10,7 @@
 namespace OCA\Polls\Migration\RepairSteps;
 
 use Doctrine\DBAL\Schema\Schema;
+use Exception;
 use OCA\Polls\Db\Poll;
 use OCA\Polls\Db\TableManager;
 use OCA\Polls\Db\WatchMapper;
@@ -38,15 +39,18 @@ public function getName():string {
 
 	public function run(IOutput $output):void {
 		if ($this->connection->tableExists(Poll::TABLE)) {
-			$this->schema = $this->connection->createSchema();
-			$this->tableManager->setSchema($this->schema);
+			try {
+				$this->schema = $this->connection->createSchema();
+				$this->tableManager->setSchema($this->schema);
 
-			$this->tableManager->removeOrphaned();
-			$this->tableManager->deleteAllDuplicates();
+				$this->tableManager->removeOrphaned();
+				$this->tableManager->deleteAllDuplicates();
 
+				$this->watchMapper->deleteOldEntries(time());
+			} catch (Exception $e) {
+				// Simply skip repair, if it breaks and rely on the next run
+			}
 			$this->connection->migrateToSchema($this->schema);
-
-			$this->watchMapper->deleteOldEntries(time());
 		}
 	}
 }

lib/Migration/TableSchema.php

@@ -29,6 +29,11 @@
  */
 
 abstract class TableSchema {
+	// deprecated since 8.1.0, but keeb these constants to prevent broken updates
+	// from a version prior to 8.1.0; Fix was implemented with v8.1.2
+	public const FK_PARENT_TABLE = Poll::TABLE;
+	public const FK_CHILD_TABLES = [];
+	public const FK_OTHER_TABLES = [];
 
 	/**
 	 * define all foreign key indices

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "polls",
-  "version": "8.1.0",
+  "version": "8.1.2",
   "private": true,
   "description": "Polls app for nextcloud",
   "homepage": "https://github.com/nextcloud/polls#readme",