From ba825ef3c141ac8c450703d933edabd2e512e669 Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Thu, 21 Oct 2021 22:08:25 +0100 Subject: [PATCH] see #506 and #327 - this might unify enough of our textual latin1 columns to resolve collation issues --- public/upgrade.php | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/public/upgrade.php b/public/upgrade.php index 577b9f0d..9450e162 100644 --- a/public/upgrade.php +++ b/public/upgrade.php @@ -2042,3 +2042,28 @@ function upgrade_1845() db_query("alter table $vacation change subject subject varchar(255) charset utf8mb4 not null"); db_query("alter table $mailbox change name name varchar(255) charset utf8mb4 not null"); } + +function upgrade_1846_mysql() { + # See https://github.com/postfixadmin/postfixadmin/issues/327 + + $alias = table_by_key('alias'); + $domain = table_by_key('domain'); + $mailbox = table_by_key('mailbox'); + $vacation = table_by_key('vacation'); + $alias_domain = table_by_key('alias_domain'); + + db_query("ALTER TABLE $alias MODIFY address varchar(255) COLLATE latin1_general_ci NOT NULL"); + db_query("ALTER TABLE $alias MODIFY goto text COLLATE latin1_general_ci NOT NULL"); + db_query("ALTER TABLE $alias MODIFY domain varchar(255) COLLATE latin1_general_ci NOT NULL"); + db_query("ALTER TABLE $domain MODIFY domain varchar(255) COLLATE latin1_general_ci NOT NULL"); + db_query("ALTER TABLE $domain MODIFY transport varchar(255) COLLATE latin1_general_ci NOT NULL"); + db_query("ALTER TABLE $mailbox MODIFY username varchar(255) COLLATE latin1_general_ci NOT NULL"); + db_query("ALTER TABLE $mailbox MODIFY password varchar(255) COLLATE latin1_general_ci NOT NULL"); + db_query("ALTER TABLE $mailbox MODIFY maildir varchar(255) COLLATE latin1_general_ci NOT NULL"); + db_query("ALTER TABLE $mailbox MODIFY local_part varchar(255) COLLATE latin1_general_ci NOT NULL"); + db_query("ALTER TABLE $mailbox MODIFY domain varchar(255) COLLATE latin1_general_ci NOT NULL"); + db_query("ALTER TABLE $vacation MODIFY domain varchar(255) COLLATE latin1_general_ci NOT NULL"); + db_query("ALTER TABLE $alias_domain MODIFY alias_domain varchar(255) COLLATE latin1_general_ci NOT NULL DEFAULT ''"); + db_query("ALTER TABLE $alias_domain MODIFY target_domain varchar(255) COLLATE latin1_general_ci NOT NULL DEFAULT ''"); + +}