From 38a9f6edae6cb5d65f800b24410a294137c14081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 21 May 2015 16:32:27 +0200 Subject: [PATCH 1/2] Drop deprecated fields Fix #2870 --- htdocs/install/mysql/migration/3.7.0-3.8.0.sql | 6 +++++- htdocs/install/mysql/tables/llx_actioncomm.key.sql | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index 1d5ba017aab..4ea5351a9ae 100755 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -625,8 +625,12 @@ ALTER TABLE llx_user ADD gender VARCHAR(10); ALTER TABLE llx_user ADD api_key VARCHAR(128) DEFAULT NULL AFTER pass_temp; ALTER TABLE llx_user ADD INDEX idx_user_api_key (api_key); +-- Deprecated fields +ALTER TABLE llx_actioncomm DROP COLUMN datea; +ALTER TABLE llx_actioncomm DROP INDEX idx_actioncomm_datea; +ALTER TABLE llx_actioncomm DROP COLUMN datea2; - +-- Email tracking ALTER TABLE llx_actioncomm ADD COLUMN email_msgid varchar(256); ALTER TABLE llx_actioncomm ADD COLUMN email_from varchar(256); ALTER TABLE llx_actioncomm ADD COLUMN email_sender varchar(256); diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 1da34c65bab..64162dbbc73 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -18,7 +18,6 @@ -- =========================================================================== -ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_datea (datea); ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_fk_soc (fk_soc); ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_fk_contact (fk_contact); ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_code (code); From fc88df9ddf56264043c3b5495495d4aba17ef3a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 21 May 2015 16:33:38 +0200 Subject: [PATCH 2/2] Fixed typo --- htdocs/install/mysql/migration/3.7.0-3.8.0.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index 4ea5351a9ae..aabca14f5a1 100755 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -636,9 +636,11 @@ ALTER TABLE llx_actioncomm ADD COLUMN email_from varchar(256); ALTER TABLE llx_actioncomm ADD COLUMN email_sender varchar(256); ALTER TABLE llx_actioncomm ADD COLUMN email_to varchar(256); ALTER TABLE llx_actioncomm ADD COLUMN errors_to varchar(256); + +-- Recuring events ALTER TABLE llx_actioncomm ADD COLUMN recurid varchar(128); ALTER TABLE llx_actioncomm ADD COLUMN recurrule varchar(128); -ALTER TABLE llx_actioncomm ADD COLUMN ecurdateend datetime; +ALTER TABLE llx_actioncomm ADD COLUMN recurdateend datetime; ALTER TABLE llx_stcomm ADD COLUMN picto varchar(128);