From b9834da7f21492965aab91fc1cb2cc1bea4bedb0 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 10 Dec 2024 12:56:03 +0000
Subject: [PATCH] combine migrations 5.5.23 and 5.5.23.1, fixes #4981
Closes #4981
Merge request studip/studip!3739
---
...ange_collation_for_wiki_tables_user_id.php | 25 -------------------
db/migrations/5.5.23_modernize_wiki.php | 4 +--
2 files changed, 2 insertions(+), 27 deletions(-)
delete mode 100644 db/migrations/5.5.23.1_change_collation_for_wiki_tables_user_id.php
diff --git a/db/migrations/5.5.23.1_change_collation_for_wiki_tables_user_id.php b/db/migrations/5.5.23.1_change_collation_for_wiki_tables_user_id.php
deleted file mode 100644
index 8b2fa8a98be..00000000000
--- a/db/migrations/5.5.23.1_change_collation_for_wiki_tables_user_id.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-final class ChangeCollationForWikiTablesUserId extends Migration
-{
- protected function up()
- {
- $query = "ALTER TABLE `wiki_versions`
- CHANGE COLUMN `user_id` `user_id` CHAR(32) COLLATE `latin1_bin` NOT NULL";
- DBManager::get()->exec($query);
-
- $query = "ALTER TABLE `wiki_pages`
- CHANGE COLUMN `user_id` `user_id` CHAR(32) COLLATE `latin1_bin` NOT NULL";
- DBManager::get()->exec($query);
- }
-
- protected function down()
- {
- $query = "ALTER TABLE `wiki_versions`
- CHANGE COLUMN `user_id` `user_id` CHAR(32) NOT NULL";
- DBManager::get()->exec($query);
-
- $query = "ALTER TABLE `wiki_pages`
- CHANGE COLUMN `user_id` `user_id` CHAR(32) NOT NULL";
- DBManager::get()->exec($query);
- }
-}
diff --git a/db/migrations/5.5.23_modernize_wiki.php b/db/migrations/5.5.23_modernize_wiki.php
index a6b975ae498..9478818db08 100644
--- a/db/migrations/5.5.23_modernize_wiki.php
+++ b/db/migrations/5.5.23_modernize_wiki.php
@@ -19,7 +19,7 @@ final class ModernizeWiki extends Migration
`parent_id` int(11) DEFAULT NULL,
`read_permission` varchar(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT 'all',
`write_permission` varchar(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT 'all',
- `user_id` char(32) NOT NULL,
+ `user_id` char(32) COLLATE `latin1_bin` NOT NULL,
`locked_since` bigint(20) DEFAULT NULL,
`locked_by_user_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
`chdate` bigint(20) NOT NULL,
@@ -36,7 +36,7 @@ final class ModernizeWiki extends Migration
`page_id` int(11) unsigned NOT NULL,
`name` varchar(128) NOT NULL,
`content` text DEFAULT NULL,
- `user_id` char(32) NOT NULL,
+ `user_id` char(32) COLLATE `latin1_bin` NOT NULL,
`mkdate` bigint(20) NOT NULL,
PRIMARY KEY (`version_id`),
KEY `page_id` (`page_id`),
--
GitLab