merge in e8f3c40442 and bbec16aac1 from master -> see #475 - add primary key column to domain_admins (id autoinc.) to help people who want to use db replication

This commit is contained in:
David Goodwin committed 2021-04-13 21:45:10 +01:00
1 parent 1c456baa56
commit 63f267f0fa
1 file changed
+6 -3
+6 -3
View File
@@ -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}');
}