aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Hendrik Willms <tleilax+studip@gmail.com>2026-02-26 21:07:28 +0100
committerJan-Hendrik Willms <tleilax+studip@gmail.com>2026-02-26 21:07:28 +0100
commit48f0570711870f913e9bbf6ea3c69faeedf0f4ad (patch)
tree637b2a8dad04cd84ea33915d1fee1608cab1ea97
parentde5896e78f141c5f6fd39b6a3fed2f0a24f5a922 (diff)
fix faulty migrations, fixes #6048
Closes #6048 Merge request studip/studip!4618
-rw-r--r--db/migrations/5.5.23_modernize_wiki.php15
1 files changed, 9 insertions, 6 deletions
diff --git a/db/migrations/5.5.23_modernize_wiki.php b/db/migrations/5.5.23_modernize_wiki.php
index cfa3b89..4d5385b 100644
--- a/db/migrations/5.5.23_modernize_wiki.php
+++ b/db/migrations/5.5.23_modernize_wiki.php
@@ -176,8 +176,8 @@ final class ModernizeWiki extends Migration
DBManager::get()->exec("
INSERT INTO `wiki_pages` (`range_id`, `name`, `content`, `parent_id`, `read_permission`, `write_permission`, `user_id`, `chdate`, `mkdate`)
SELECT `superwiki_pages`.`seminar_id`,
- CONVERT(`superwiki_pages`.`name` USING utf8mb4),
- CONVERT(`superwiki_pages`.`content` USING utf8mb4),
+ `superwiki_pages`.`name`,
+ `superwiki_pages`.`content`,
NULL,
`superwiki_pages`.`read_permission`,
`superwiki_pages`.`write_permission`,
@@ -189,13 +189,16 @@ final class ModernizeWiki extends Migration
DBManager::get()->exec("
INSERT INTO `wiki_versions` (`page_id`, `name`, `content`, `user_id`, `mkdate`)
SELECT `wiki_pages`.`page_id`,
- CONVERT(`superwiki_versions`.`name` USING utf8mb4),
- CONVERT(`superwiki_versions`.`content` USING utf8mb4),
+ `superwiki_versions`.`name`,
+ `superwiki_versions`.`content`,
`superwiki_versions`.`last_author`,
`superwiki_versions`.`chdate`
FROM `superwiki_versions`
- INNER JOIN `superwiki_pages` ON (`superwiki_pages`.`page_id` = `superwiki_versions`.`page_id`)
- INNER JOIN `wiki_pages` ON (`wiki_pages`.`range_id` = `superwiki_pages`.`seminar_id` AND `wiki_pages`.`name` = `superwiki_pages`.`name`)
+ JOIN `superwiki_pages` ON (`superwiki_pages`.`page_id` = `superwiki_versions`.`page_id`)
+ JOIN `wiki_pages` ON (
+ `wiki_pages`.`range_id` = `superwiki_pages`.`seminar_id`
+ AND `wiki_pages`.`name` = CONVERT(`superwiki_pages`.`name` USING utf8mb4)
+ )
");
}
DBManager::get()->exec("