From 815c77f2711cbfd71439c80f0f7c5b911c6302f0 Mon Sep 17 00:00:00 2001 From: Florian Schaal Date: Fri, 28 Apr 2017 10:34:44 +0200 Subject: [PATCH] update databse - strict_mode compatible (https://www.howtoforge.com/community/threads/email-warning-after-modification-of-spam-level.76247/) --- .../sql/incremental/upd_dev_collection.sql | 14 +++++++++++ install/sql/ispconfig3.sql | 24 +++++++++---------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql index 44383d22f0..51cb7b0d03 100644 --- a/install/sql/incremental/upd_dev_collection.sql +++ b/install/sql/incremental/upd_dev_collection.sql @@ -1,3 +1,17 @@ ALTER TABLE `web_domain` CHANGE `folder_directive_snippets` `folder_directive_snippets` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL; ALTER TABLE `web_domain` ADD `log_retention` INT NOT NULL DEFAULT '30' AFTER `https_port`; ALTER TABLE `web_domain` CHANGE `stats_type` `stats_type` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT 'awstats'; + +ALTER TABLE `spamfilter_policy` +CHANGE `virus_lover` `virus_lover` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', +CHANGE `spam_lover` `spam_lover` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', +CHANGE `banned_files_lover` `banned_files_lover` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', +CHANGE `bad_header_lover` `bad_header_lover` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', +CHANGE `bypass_virus_checks` `bypass_virus_checks` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', +CHANGE `bypass_spam_checks` `bypass_spam_checks` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', +CHANGE `bypass_banned_checks` `bypass_banned_checks` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', +CHANGE `bypass_header_checks` `bypass_header_checks` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', +CHANGE `spam_modifies_subj` `spam_modifies_subj` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', +CHANGE `warnvirusrecip` `warnvirusrecip` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', +CHANGE `warnbannedrecip` `warnbannedrecip` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N', +CHANGE `warnbadhrecip` `warnbadhrecip` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N'; diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 52b9bebc53..68cd76f0e5 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -1472,15 +1472,15 @@ CREATE TABLE `spamfilter_policy` ( `sys_perm_group` varchar(5) NOT NULL DEFAULT '', `sys_perm_other` varchar(5) NOT NULL DEFAULT '', `policy_name` varchar(64) default NULL, - `virus_lover` enum('N','Y') default NULL, - `spam_lover` enum('N','Y') default NULL, - `banned_files_lover` enum('N','Y') default NULL, - `bad_header_lover` enum('N','Y') default NULL, - `bypass_virus_checks` enum('N','Y') default NULL, - `bypass_spam_checks` enum('N','Y') default NULL, - `bypass_banned_checks` enum('N','Y') default NULL, - `bypass_header_checks` enum('N','Y') default NULL, - `spam_modifies_subj` enum('N','Y') default NULL, + `virus_lover` enum('N','Y') default 'N', + `spam_lover` enum('N','Y') default 'N', + `banned_files_lover` enum('N','Y') default 'N', + `bad_header_lover` enum('N','Y') default 'N', + `bypass_virus_checks` enum('N','Y') default 'N', + `bypass_spam_checks` enum('N','Y') default 'N', + `bypass_banned_checks` enum('N','Y') default 'N', + `bypass_header_checks` enum('N','Y') default 'N', + `spam_modifies_subj` enum('N','Y') default 'N', `virus_quarantine_to` varchar(255) default NULL, `spam_quarantine_to` varchar(255) default NULL, `banned_quarantine_to` varchar(255) default NULL, @@ -1496,9 +1496,9 @@ CREATE TABLE `spamfilter_policy` ( `addr_extension_spam` varchar(64) default NULL, `addr_extension_banned` varchar(64) default NULL, `addr_extension_bad_header` varchar(64) default NULL, - `warnvirusrecip` enum('N','Y') default NULL, - `warnbannedrecip` enum('N','Y') default NULL, - `warnbadhrecip` enum('N','Y') default NULL, + `warnvirusrecip` enum('N','Y') default 'N', + `warnbannedrecip` enum('N','Y') default 'N', + `warnbadhrecip` enum('N','Y') default 'N', `newvirus_admin` varchar(64) default NULL, `virus_admin` varchar(64) default NULL, `banned_admin` varchar(64) default NULL, -- GitLab