From 63f267f0fa5cb825c6552b699b6fb52f35c9d5e9 Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Tue, 13 Apr 2021 21:26:11 +0100 Subject: [PATCH] merge in e8f3c4044240ba5b7568fba86212cdce6cb164a7 and bbec16aac15cbc8afbc64b3d5fdcbed4a95f31e5 from master -> see #475 - add primary key column to domain_admins (id autoinc.) to help people who want to use db replication --- public/upgrade.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/public/upgrade.php b/public/upgrade.php index 0bc1d178..252d331e 100644 --- a/public/upgrade.php +++ b/public/upgrade.php @@ -1827,9 +1827,7 @@ function upgrade_1836_mysql() { * @return void */ function upgrade_1837() { - global $CONF; - - if ($CONF['database_type'] == 'sqlite') { + if (db_sqlite()) { return; } # alternative contact means to reset a forgotten password @@ -1942,5 +1940,10 @@ function upgrade_1843() { */ function upgrade_1844() { # See:https://github.com/postfixadmin/postfixadmin/issues/475 - add pkey to domain_admins. + + if (db_sqlite()) { + return; + } + _db_add_field('domain_admins', 'id', '{AUTOINCREMENT} {PRIMARY}'); }