Merge branch...

Merge branch '6226-syntax-error-in-upd_0093-sql-causes-software_-tables-not-to-be-dropped' into 'develop'

Resolve "Syntax error in upd_0093.sql causes software_* tables not to be dropped"

Closes #6226

See merge request ispconfig/ispconfig3!1520

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';

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`;