From 16cc68a2fed58199486d10253995e09e966a2380 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 21 Dec 2018 13:02:25 +0100
Subject: [PATCH] Add twofactor_providers_uid index
Fixes #12943
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
core/Application.php | 8 ++++++++
core/Command/Db/AddMissingIndices.php | 17 +++++++++++++++--
.../Version14000Date20180522074438.php | 1 +
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/core/Application.php b/core/Application.php
index a65f1f3fa60..94990df9356 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -85,6 +85,14 @@ class Application extends App {
$subject->addHintForMissingSubject($table->getName(), 'fs_mtime');
}
}
+
+ if ($schema->hasTable('twofactor_providers')) {
+ $table = $schema->getTable('twofactor_providers');
+
+ if (!$table->hasIndex('twofactor_providers_uid')) {
+ $subject->addHintForMissingSubject($table->getName(), 'twofactor_providers_uid');
+ }
+ }
}
);
}
diff --git a/core/Command/Db/AddMissingIndices.php b/core/Command/Db/AddMissingIndices.php
index 8fb5f9b4e88..3bc66988529 100644
--- a/core/Command/Db/AddMissingIndices.php
+++ b/core/Command/Db/AddMissingIndices.php
@@ -61,7 +61,7 @@ class AddMissingIndices extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output) {
- $this->addShareTableIndicies($output);
+ $this->addCoreIndexes($output);
// Dispatch event so apps can also update indexes if needed
$event = new GenericEvent($output);
@@ -74,7 +74,7 @@ class AddMissingIndices extends Command {
* @param OutputInterface $output
* @throws \Doctrine\DBAL\Schema\SchemaException
*/
- private function addShareTableIndicies(OutputInterface $output) {
+ private function addCoreIndexes(OutputInterface $output) {
$output->writeln('<info>Check indices of the share table.</info>');
@@ -116,6 +116,7 @@ class AddMissingIndices extends Command {
}
}
+ $output->writeln('<info>Check indices of the filecache table.</info>');
if ($schema->hasTable('filecache')) {
$table = $schema->getTable('filecache');
if (!$table->hasIndex('fs_mtime')) {
@@ -127,6 +128,18 @@ class AddMissingIndices extends Command {
}
}
+ $output->writeln('<info>Check indices of the twofactor_providers table.</info>');
+ if ($schema->hasTable('twofactor_providers')) {
+ $table = $schema->getTable('twofactor_providers');
+ if (!$table->hasIndex('twofactor_providers_uid')) {
+ $output->writeln('<info>Adding additional twofactor_providers_uid index to the twofactor_providers table, this can take some time...</info>');
+ $table->addIndex(['uid'], 'twofactor_providers_uid');
+ $this->connection->migrateToSchema($schema->getWrappedSchema());
+ $updated = true;
+ $output->writeln('<info>Twofactor_providers table updated successfully.</info>');
+ }
+ }
+
if (!$updated) {
$output->writeln('<info>Done.</info>');
}
diff --git a/core/Migrations/Version14000Date20180522074438.php b/core/Migrations/Version14000Date20180522074438.php
index 28207d0b900..bb0de125f6f 100644
--- a/core/Migrations/Version14000Date20180522074438.php
+++ b/core/Migrations/Version14000Date20180522074438.php
@@ -55,6 +55,7 @@ class Version14000Date20180522074438 extends SimpleMigrationStep {
'length' => 1,
]);
$table->setPrimaryKey(['provider_id', 'uid']);
+ $table->addIndex(['uid'], 'twofactor_providers_uid');
}
return $schema;
--
GitLab