add new index in repair step instead of on-migrate

Signed-off-by: Robin Appelman <robin@icewind.nl>

3 files changed, 12 insertions, 1 deletions

diff --git a/core/Application.php b/core/Application.php
index 4ebbada95e6..2e354610154 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -239,6 +239,9 @@ class Application extends App {
 					if (!$table->hasIndex('mounts_class_index')) {
 						$subject->addHintForMissingSubject($table->getName(), 'mounts_class_index');
 					}
+					if (!$table->hasIndex('mounts_user_root_path_index')) {
+						$subject->addHintForMissingSubject($table->getName(), 'mounts_user_root_path_index');
+					}
 				}
 			}
 		);
diff --git a/core/Command/Db/AddMissingIndices.php b/core/Command/Db/AddMissingIndices.php
index e22d0fddeca..b317f44b499 100644
--- a/core/Command/Db/AddMissingIndices.php
+++ b/core/Command/Db/AddMissingIndices.php
@@ -465,6 +465,14 @@ class AddMissingIndices extends Command {
 				$updated = true;
 				$output->writeln('<info>oc_mounts table updated successfully.</info>');
 			}
+			if (!$table->hasIndex('mounts_user_root_path_index')) {
+				$output->writeln('<info>Adding mounts_user_root_path_index index to the oc_mounts table, this can take some time...</info>');
+
+				$table->addIndex(['user_id', 'root_id', 'mount_point'], 'mounts_user_root_path_index', [], ['lengths' => [null, null, 128]]);
+				$this->connection->migrateToSchema($schema->getWrappedSchema());
+				$updated = true;
+				$output->writeln('<info>oc_mounts table updated successfully.</info>');
+			}
 		}
 
 		if (!$updated) {
diff --git a/core/Migrations/Version27000Date20220613163520.php b/core/Migrations/Version27000Date20220613163520.php
index 5f327e69c96..4217f3b3270 100644
--- a/core/Migrations/Version27000Date20220613163520.php
+++ b/core/Migrations/Version27000Date20220613163520.php
@@ -43,7 +43,7 @@ class Version27000Date20220613163520 extends SimpleMigrationStep {
 		$table = $schema->getTable('mounts');
 		if ($table->hasIndex('mounts_user_root_index')) {
 			$table->dropIndex('mounts_user_root_index');
-			$table->addIndex(['user_id', 'root_id', 'mount_point'], 'mounts_user_root_path_index', [], ['lengths' => [null, null, 128]]);
+			// new index gets added with "add missing indexes"
 		}
 
 		return $schema;