diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2024-12-10 12:56:03 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2024-12-10 12:56:03 +0000 |
| commit | b9834da7f21492965aab91fc1cb2cc1bea4bedb0 (patch) | |
| tree | d42027e83fcff7228e8d2db1100f7c22d6aa8c84 /db | |
| parent | fe304be167d0306d9e5161ed504b107117b59841 (diff) | |
combine migrations 5.5.23 and 5.5.23.1, fixes #4981
Closes #4981
Merge request studip/studip!3739
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrations/5.5.23.1_change_collation_for_wiki_tables_user_id.php | 25 | ||||
| -rw-r--r-- | db/migrations/5.5.23_modernize_wiki.php | 4 |
2 files changed, 2 insertions, 27 deletions
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 8b2fa8a..0000000 --- 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 a6b975a..9478818 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`), |