mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2026-11-20 23:43:26 +03:00
try and improve mysql db collation fix - see #591
This commit is contained in:
1 parent
272e5bddb9
commit
08ce130d58
1 file changed
+54
@@ -2048,31 +2048,85 @@ function upgrade_1846_mysql()
|
||||
# See https://github.com/postfixadmin/postfixadmin/issues/327
|
||||
|
||||
$alias = table_by_key('alias');
|
||||
$admin = table_by_key('admin');
|
||||
$domain = table_by_key('domain');
|
||||
$fetchmail = table_by_key('fetchmail');
|
||||
$mailbox = table_by_key('mailbox');
|
||||
$quota2 = table_by_key('quota2');
|
||||
$quota = table_by_key('quota');
|
||||
$log = table_by_key('log');
|
||||
$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');
|
||||
|
||||
// ALTER DATABASE postfix DEFAULT COLLATE latin1_general_ci;
|
||||
|
||||
db_query("alter table $admin collate latin1_general_ci");
|
||||
db_query("alter table $alias collate latin1_general_ci");
|
||||
db_query("alter table $alias_domain collate latin1_general_ci");
|
||||
|
||||
db_query("alter table $domain collate latin1_general_ci");
|
||||
db_query("alter table $domain_admins collate latin1_general_ci");
|
||||
db_query("alter table $log collate latin1_general_ci");
|
||||
db_query("alter table $mailbox collate latin1_general_ci");
|
||||
db_query("alter table $quota collate latin1_general_ci");
|
||||
db_query("alter table $quota2 collate latin1_general_ci");
|
||||
|
||||
|
||||
db_query("ALTER TABLE $admin MODIFY username varchar(255) COLLATE latin1_general_ci NOT NULL");
|
||||
db_query("ALTER TABLE $admin MODIFY password varchar(255) COLLATE latin1_general_ci NOT NULL");
|
||||
|
||||
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 $fetchmail MODIFY domain varchar(255) COLLATE latin1_general_ci DEFAULT ''");
|
||||
db_query("ALTER TABLE $fetchmail MODIFY mailbox varchar(255) COLLATE latin1_general_ci NOT NULL");
|
||||
db_query("ALTER TABLE $fetchmail MODIFY src_server varchar(255) COLLATE latin1_general_ci NOT NULL");
|
||||
db_query("ALTER TABLE $fetchmail MODIFY src_auth enum('password','kerberos_v5','kerberos','kerberos_v4','gssapi','cram-md5','otp','ntlm','msn','ssh','any') COLLATE latin1_general_ci DEFAULT NULL");
|
||||
db_query("ALTER TABLE $fetchmail MODIFY src_user varchar(255) COLLATE latin1_general_ci NOT NULL");
|
||||
db_query("ALTER TABLE $fetchmail MODIFY src_password varchar(255) COLLATE latin1_general_ci NOT NULL");
|
||||
db_query("ALTER TABLE $fetchmail MODIFY src_folder varchar(255) COLLATE latin1_general_ci NOT NULL");
|
||||
db_Query("ALTER TABLE $fetchmail MODIFY protocol enum('POP3','IMAP','POP2','ETRN','AUTO') COLLATE latin1_general_ci DEFAULT NULL");
|
||||
db_query("ALTER TABLE $fetchmail MODIFY sslfingerprint varchar(255) COLLATE latin1_general_ci DEFAULT ''");
|
||||
db_query("ALTER TABLE $fetchmail MODIFY extra_options text COLLATE latin1_general_ci DEFAULT NULL");
|
||||
db_query("ALTER TABLE $fetchmail MODIFY returned_text text COLLATE latin1_general_ci DEFAULT NULL");
|
||||
db_query("ALTER TABLE $fetchmail MODIFY mda varchar(255) COLLATE latin1_general_ci");
|
||||
|
||||
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 $quota MODIFY username varchar(255) COLLATE latin1_general_ci NOT NULL");
|
||||
db_query("ALTER TABLE $quota MODIFY path varchar(100) COLLATE latin1_general_ci NOT NULL");
|
||||
db_query("ALTER TABLE $quota2 MODIFY username varchar(100) COLLATE latin1_general_ci NOT NULL");
|
||||
|
||||
db_query("ALTER TABLE $vacation_notification DROP FOREIGN KEY vacation_notification_pkey");
|
||||
|
||||
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 $vacation MODIFY cache text COLLATE latin1_general_ci NOT NULL");
|
||||
|
||||
db_query("ALTER TABLE $log MODIFY username varchar(255) COLLATE latin1_general_ci NOT NULL");
|
||||
db_query("ALTER TABLE $log MODIFY domain varchar(255) COLLATE latin1_general_ci NOT NULL");
|
||||
db_query("ALTER TABLE $log MODIFY action varchar(255) COLLATE latin1_general_ci NOT NULL");
|
||||
db_Query("ALTER TABLE $log MODIFY data text 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 MODIFY on_vacation VARCHAR(255) COLLATE latin1_general_ci NOT NULL");
|
||||
db_query("ALTER TABLE $vacation_notification MODIFY notified VARCHAR(255) COLLATE latin1_general_ci NOT NULL DEFAULT ''");
|
||||
|
||||
|
||||
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");
|
||||
db_query("ALTER TABLE $domain_admins MODIFY username varchar(255) COLLATE latin1_general_ci NOT NULL");
|
||||
}
|
||||
Reference in new issue
Block a user