From 2ab28e795d54ea86b175fe636ac89d707789a389 Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Wed, 10 Nov 2021 19:43:14 +0000 Subject: [PATCH] fix more collation issues --- public/upgrade.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/public/upgrade.php b/public/upgrade.php index 498ce4cd..5d49b795 100644 --- a/public/upgrade.php +++ b/public/upgrade.php @@ -2051,6 +2051,7 @@ function upgrade_1846_mysql() $domain = table_by_key('domain'); $mailbox = table_by_key('mailbox'); $vacation = table_by_key('vacation'); + $vacation_notification = table_by_key('vacation_notification'); $alias_domain = table_by_key('alias_domain'); db_query("ALTER TABLE $alias MODIFY address varchar(255) COLLATE latin1_general_ci NOT NULL"); @@ -2064,6 +2065,14 @@ function upgrade_1846_mysql() 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 $vacation MODIFY email 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 ''"); + + db_query("ALTER TABLE $vacation_notification DROP CONSTRAINT vacation_notification_pkey"); + db_query("ALTER TABLE $vacation_notification MODIFY on_vacation VARCHAR(255) COLLATE latin1_general_ci NOT NULL"); + db_query("ALTER TABLE $vacation MODIFY email VARCHAR(255) COLLATE latin1_general_ci NOT NULL"); + db_query("ALTER TABLE $vacation_notification ADD CONSTRAINT vacation_notification_pkey FOREIGN KEY (`on_vacation`) REFERENCES $vacation(email) ON DELETE CASCADE"); + + }