From 382c74fec28a745ddefb7ee96fa6c5133456eaa2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Aug 2010 23:34:23 +0000 Subject: [PATCH] Fix: Error when creating 2 external rss boxes. --- htdocs/install/mysql/migration/2.8.0-2.9.0.sql | 3 +++ htdocs/install/mysql/tables/llx_boxes_def.key.sql | 5 ++++- htdocs/install/mysql/tables/llx_boxes_def.sql | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql index f97d51cfe3c..606bff4da45 100755 --- a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql +++ b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql @@ -314,3 +314,6 @@ INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, ' delete from llx_const where name='USER_PASSWORD_GENERATED' and value='default'; +ALTER TABLE llx_boxes_def DROP INDEX uk_boxes_def; +ALTER TABLE llx_boxes_def MODIFY note varchar(255); +ALTER TABLE llx_boxes_def ADD UNIQUE INDEX uk_boxes_def (file, entity, note); diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index 70192090600..66cab4c1223 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -20,4 +20,7 @@ -- =========================================================================== -ALTER TABLE llx_boxes_def ADD UNIQUE INDEX uk_boxes_def (file, entity); +-- We need to include note to allow several entries for external rss module +ALTER TABLE llx_boxes_def ADD UNIQUE INDEX uk_boxes_def (file, entity, note); + + diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index 93fde44596e..be558cd247d 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -25,11 +25,11 @@ create table llx_boxes_def file varchar(255) NOT NULL, entity integer DEFAULT 1 NOT NULL, -- multi company id tms timestamp, - note text + note varchar(255) )type=innodb; -- --- List of codes for the field entity +-- List of codes for the field "entity" -- -- 1 : first company boxes -- 2 : second company boxes