From 1466839a06fff7701442b030cee9702dc4618c79 Mon Sep 17 00:00:00 2001 From: Till Brehm Date: Fri, 3 Sep 2021 08:03:42 +0000 Subject: [PATCH 1/2] Update upd_0093.sql --- install/sql/incremental/upd_0093.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/sql/incremental/upd_0093.sql b/install/sql/incremental/upd_0093.sql index 71efb3085e..96c5307f0e 100644 --- a/install/sql/incremental/upd_0093.sql +++ b/install/sql/incremental/upd_0093.sql @@ -12,10 +12,10 @@ ALTER TABLE mail_domain ADD COLUMN `relay_host` varchar(255) NOT NULL default '' ADD COLUMN `relay_user` varchar(255) NOT NULL default '' AFTER `relay_host`, ADD COLUMN `relay_pass` varchar(255) NOT NULL default '' AFTER `relay_user`; -- Purge apps & addons installer (#5795) -DROP TABLE 'software_package'; -DROP TABLE 'software_repo'; -DROP TABLE 'software_update'; -DROP TABLE 'software_update_inst'; +DROP TABLE `software_package`; +DROP TABLE `software_repo`; +DROP TABLE `software_update`; +DROP TABLE `software_update_inst`; -- Brexit UPDATE `country` SET `eu` = 'n' WHERE `iso` = 'GB'; -- GitLab From caef217b5ec315a214e611bd05655f8b52f81687 Mon Sep 17 00:00:00 2001 From: Till Brehm Date: Fri, 3 Sep 2021 08:04:49 +0000 Subject: [PATCH 2/2] Update upd_dev_collection.sql --- install/sql/incremental/upd_dev_collection.sql | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql index 75a6b01d93..c0d4bf04f6 100644 --- a/install/sql/incremental/upd_dev_collection.sql +++ b/install/sql/incremental/upd_dev_collection.sql @@ -4,3 +4,9 @@ ALTER TABLE `spamfilter_users` ALTER `policy_id` SET DEFAULT 0; -- mail_forwarding.source must be unique ALTER TABLE `mail_forwarding` DROP KEY `server_id`; ALTER TABLE `mail_forwarding` ADD UNIQUE KEY `server_id` (`server_id`, `source`); + +-- Purge apps & addons installer (#5795) - second time due to syntax error in 0093 +DROP TABLE IF EXISTS `software_package`; +DROP TABLE IF EXISTS `software_repo`; +DROP TABLE IF EXISTS `software_update`; +DROP TABLE IF EXISTS `software_update_inst`; -- GitLab