From ee9ad9c9dedb8a48fc8dc6b812091338e69ff567 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Thu, 22 Jun 2023 09:49:53 +0200
Subject: [PATCH] fix(systemtags): Move index creation from new migration to
 existing original migration

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
---
 .../Version13000Date20170718121200.php        |  2 +-
 .../Version28000Date20230621185127.php        | 52 -------------------
 2 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 core/Migrations/Version28000Date20230621185127.php

diff --git a/core/Migrations/Version13000Date20170718121200.php b/core/Migrations/Version13000Date20170718121200.php
index 34a249814fb..bcf14656fec 100644
--- a/core/Migrations/Version13000Date20170718121200.php
+++ b/core/Migrations/Version13000Date20170718121200.php
@@ -753,7 +753,7 @@ class Version13000Date20170718121200 extends SimpleMigrationStep {
 				'unsigned' => true,
 			]);
 			$table->setPrimaryKey(['objecttype', 'objectid', 'systemtagid'], 'som_pk');
-//			$table->addUniqueIndex(['objecttype', 'objectid', 'systemtagid'], 'mapping');
+			$table->addIndex(['systemtagid', 'objecttype'], 'systag_by_tagid');
 		}
 
 		if (!$schema->hasTable('systemtag_group')) {
diff --git a/core/Migrations/Version28000Date20230621185127.php b/core/Migrations/Version28000Date20230621185127.php
deleted file mode 100644
index eb656bb89df..00000000000
--- a/core/Migrations/Version28000Date20230621185127.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * @copyright Copyright (c) 2023 Marcel Klehr <mklehr@gmx.net>
- *
- * @author Marcel Klehr <mklehr@gmx.net>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-namespace OC\Core\Migrations;
-
-use Closure;
-use OCP\DB\ISchemaWrapper;
-use OCP\Migration\IOutput;
-use OCP\Migration\SimpleMigrationStep;
-
-class Version28000Date20230621185127 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		$table = $schema->getTable('systemtag_object_mapping');
-		if (!$table->hasIndex('systag_by_tagid')) {
-			$table->addIndex(['systemtagid', 'objecttype'], 'systag_by_tagid');
-			return $schema;
-		}
-
-		return null;
-	}
-}
-- 
2.39.5