From 0f9f67be0fd880d265d019312bdf585d40cfb9af Mon Sep 17 00:00:00 2001 From: Kent Riboe Date: Thu, 9 Apr 2026 11:24:57 +0300 Subject: [PATCH] Add missing database indexes for domain_admins and fetchmail (#1010) * Add missing database indexes for domain_admins and fetchmail (see #972) Adds composite index on domain_admins(username, domain, active) for permission checks that run on every admin operation, and index on fetchmail(mailbox) for domain deletion cascades. --- public/upgrade.php | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/public/upgrade.php b/public/upgrade.php index 05d12e93..a5415882 100644 --- a/public/upgrade.php +++ b/public/upgrade.php @@ -2183,3 +2183,49 @@ function upgrade_1851_mysql() ) "); } + +/** + * Add missing indexes for better performance on larger installations. + * See https://github.com/postfixadmin/postfixadmin/issues/972 + * + * domain_admins: composite index for permission checks + * queried with WHERE username=? AND (domain=? OR domain='ALL') AND active=? + * fetchmail: index on domain for domain-based filtering and deletion cascades + */ +function upgrade_1852_mysql() +{ + $domain_admins = table_by_key('domain_admins'); + $fetchmail = table_by_key('fetchmail'); + + $result = db_query_one("SHOW INDEX FROM $domain_admins WHERE Key_name = 'idx_domadm_user_domain_active'"); + if (empty($result)) { + db_query("ALTER TABLE $domain_admins ADD INDEX idx_domadm_user_domain_active (username, domain, active)"); + } + + $result = db_query_one("SHOW INDEX FROM $fetchmail WHERE Key_name = 'idx_fetchmail_domain'"); + if (empty($result)) { + db_query("ALTER TABLE $fetchmail ADD INDEX idx_fetchmail_domain (domain)"); + } +} + +function upgrade_1852_pgsql() +{ + $domain_admins = table_by_key('domain_admins'); + $fetchmail = table_by_key('fetchmail'); + + if (!_pgsql_object_exists('idx_domadm_user_domain_active')) { + db_query("CREATE INDEX idx_domadm_user_domain_active ON $domain_admins (username, domain, active)"); + } + if (!_pgsql_object_exists('idx_fetchmail_domain')) { + db_query("CREATE INDEX idx_fetchmail_domain ON $fetchmail (domain)"); + } +} + +function upgrade_1852_sqlite() +{ + $domain_admins = table_by_key('domain_admins'); + $fetchmail = table_by_key('fetchmail'); + + db_query("CREATE INDEX IF NOT EXISTS idx_domadm_user_domain_active ON $domain_admins (username, domain, active)"); + db_query("CREATE INDEX IF NOT EXISTS idx_fetchmail_domain ON $fetchmail (domain)"); +}