From 52ed517f35fc2bfde193fad94ddd07d2e5cd4c8d Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Tue, 7 Dec 2021 19:42:49 +0000 Subject: [PATCH] also fix collation on domain_admins.domain to be latin1_general_ci - see also #327 (else a domain admin cannot login) --- public/upgrade.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/upgrade.php b/public/upgrade.php index 1ebf5ed7..5ebf1f0b 100644 --- a/public/upgrade.php +++ b/public/upgrade.php @@ -2053,6 +2053,7 @@ function upgrade_1846_mysql() $vacation = table_by_key('vacation'); $vacation_notification = table_by_key('vacation_notification'); $alias_domain = table_by_key('alias_domain'); + $domain_admins = table_by_key('domain_admins'); 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"); @@ -2072,4 +2073,6 @@ function upgrade_1846_mysql() db_query("ALTER TABLE $vacation_notification MODIFY on_vacation 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"); + + db_query("ALTER TABLE $domain_admins MODIFY `domain` varchar(255) COLLATE latin1_general_ci NOT NULL"); }