From 835351bf82485f8cf708cd29d6ed828f505c7413 Mon Sep 17 00:00:00 2001 From: Till Brehm Date: Thu, 29 Jun 2017 18:05:15 +0200 Subject: [PATCH] Fixed #4499 Change column types of spamfilter_policy --- install/sql/incremental/upd_dev_collection.sql | 3 ++- install/sql/ispconfig3.sql | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql index 793bd593bc..0c91f1a724 100644 --- a/install/sql/incremental/upd_dev_collection.sql +++ b/install/sql/incremental/upd_dev_collection.sql @@ -16,4 +16,5 @@ CHANGE `warnbannedrecip` `warnbannedrecip` ENUM('N','Y') CHARACTER SET utf8 COLL CHANGE `warnbadhrecip` `warnbadhrecip` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N'; ALTER TABLE `dns_rr` CHANGE `data` `data` TEXT NOT NULL; ALTER TABLE `web_database` CHANGE `database_quota` `database_quota` INT(11) NULL DEFAULT NULL; -ALTER TABLE `web_domain` ADD `log_retention` INT NOT NULL DEFAULT '30' ; \ No newline at end of file +ALTER TABLE `web_domain` ADD `log_retention` INT NOT NULL DEFAULT '30' ; +ALTER TABLE spamfilter_policy CHANGE spam_tag_level spam_tag_level DECIMAL(5,2) NULL DEFAULT NULL, CHANGE spam_tag2_level spam_tag2_level DECIMAL(5,2) NULL DEFAULT NULL, CHANGE spam_kill_level spam_kill_level DECIMAL(5,2) NULL DEFAULT NULL, CHANGE spam_dsn_cutoff_level spam_dsn_cutoff_level DECIMAL(5,2) NULL DEFAULT NULL, CHANGE spam_quarantine_cutoff_level spam_quarantine_cutoff_level DECIMAL(5,2) NULL DEFAULT NULL; \ No newline at end of file diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 3e9642d6c0..43cbc367bd 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -1487,11 +1487,11 @@ CREATE TABLE `spamfilter_policy` ( `bad_header_quarantine_to` varchar(255) default NULL, `clean_quarantine_to` varchar(255) default NULL, `other_quarantine_to` varchar(255) default NULL, - `spam_tag_level` float default NULL, - `spam_tag2_level` float default NULL, - `spam_kill_level` float default NULL, - `spam_dsn_cutoff_level` float default NULL, - `spam_quarantine_cutoff_level` float default NULL, + `spam_tag_level` DECIMAL(5,2) default NULL, + `spam_tag2_level` DECIMAL(5,2) default NULL, + `spam_kill_level` DECIMAL(5,2) default NULL, + `spam_dsn_cutoff_level` DECIMAL(5,2) default NULL, + `spam_quarantine_cutoff_level` DECIMAL(5,2) default NULL, `addr_extension_virus` varchar(64) default NULL, `addr_extension_spam` varchar(64) default NULL, `addr_extension_banned` varchar(64) default NULL, -- GitLab