Merge pull request #3694 from nextcloud/fix/image-recraetion-hotfix

Avoid expensive index recreation

CHANGELOG.md

@@ -4,6 +4,12 @@
 -->
 # Changelog
 ##
+## [7.2.2] - 2024-09-06
+### Fix
+ - fix watcher in situations it may fail on pollId 0
+ - fix failing routes on tokens with trailing spaces
+ - Removed index removal from the pre-migration repair steps
+
 ## [7.2.1] - 2024-08-22
 ### Fix
  - Fix deleted user when email share registers

appinfo/info.xml

@@ -58,7 +58,6 @@
  <repair-steps>
  <pre-migration>
  <step>OCA\Polls\Migration\RepairSteps\RemoveObsoleteMigrations</step>
- <step>OCA\Polls\Migration\RepairSteps\RemoveIndices</step>
  </pre-migration>
  <post-migration>
  <step>OCA\Polls\Migration\RepairSteps\DropOrphanedTables</step>

lib/Command/Db/Rebuild.php

@@ -1,9 +1,9 @@
 <?php
 
 declare(strict_types=1);
-/**
- * SPDX-FileCopyrightText: 2021 Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
+/**
+ * SPDX-FileCopyrightText: 2021 Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 namespace OCA\Polls\Command\Db;
@@ -23,6 +23,12 @@ class Rebuild extends Command {
  protected array $operationHints = [
  'All polls tables will get checked against the current schema.',
  'NO data migration will be executed, so make sure you have a backup of your database.',
+ '',
+ '*****************************',
+ '** Please understand **',
+ '*****************************',
+ 'The process will also recreate all indices and foreign key constraints.',
+ 'This can lead to a database performance impact on the app after the recreation is done.',
  ];
 
  public function __construct(

lib/Db/IndexManager.php

@@ -73,7 +73,7 @@ public function createForeignKeyConstraints(): array {
  /**
  * add an on delete fk contraint
  *
- * @param string $parentTableName name of reffered table
+ * @param string $parentTableName name of referred table
  * @param string $childTableName name of referring table
  * @return string log message
  */

lib/Service/PreferencesService.php

@@ -30,7 +30,7 @@ public function __construct(
  public function load(): void {
  try {
  $this->preferences = $this->preferencesMapper->find($this->userSession->getCurrentUserId());
- } catch (Exception $e) {
+ } catch (Exception $e) {
  $this->preferences = new Preferences;
  }
  }

lib/Service/WatchService.php

@@ -37,7 +37,7 @@ public function __construct(
  */
  public function watchUpdates(int $pollId, ?int $offset = null): array {
 
- if($pollId !== 0) {
+ if ($pollId !== 0) {
  $this->pollMapper->find($pollId)->request(Poll::PERMISSION_POLL_VIEW);
  }