From 2aa3995b73d808fd4a325000d312e2f95c4ec26b Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 21 Aug 2014 06:01:47 +0200 Subject: [PATCH 1/2] Fix :: Sql problem for fresh install on resource table // Ok in migration script --- htdocs/install/mysql/tables/llx_c_type_resource.key.sql | 2 +- htdocs/install/mysql/tables/llx_c_type_resource.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/mysql/tables/llx_c_type_resource.key.sql b/htdocs/install/mysql/tables/llx_c_type_resource.key.sql index 5a76ff0cfa6..dc5c5ee150a 100644 --- a/htdocs/install/mysql/tables/llx_c_type_resource.key.sql +++ b/htdocs/install/mysql/tables/llx_c_type_resource.key.sql @@ -17,5 +17,5 @@ -- ======================================================================== -ALTER TABLE llx_c_type_contact ADD UNIQUE INDEX uk_c_type_contact_id (element, source, code); +ALTER TABLE llx_c_type_resource ADD UNIQUE INDEX uk_c_type_resource_id (label, code); diff --git a/htdocs/install/mysql/tables/llx_c_type_resource.sql b/htdocs/install/mysql/tables/llx_c_type_resource.sql index efb505ba574..8ba088c075e 100644 --- a/htdocs/install/mysql/tables/llx_c_type_resource.sql +++ b/htdocs/install/mysql/tables/llx_c_type_resource.sql @@ -29,6 +29,6 @@ create table llx_c_type_resource ( rowid integer PRIMARY KEY, code varchar(32) NOT NULL, - libelle varchar(64) NOT NULL, + label varchar(64) NOT NULL, active tinyint DEFAULT 1 NOT NULL )ENGINE=innodb; From b7daef10c6f7c4c1ae3fbf2a86bd6797f932a423 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Tue, 26 Aug 2014 04:35:22 +0200 Subject: [PATCH 2/2] Fix llx_c_type_resource when you update from a 3.6-beta --- htdocs/install/mysql/migration/3.5.0-3.6.0.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql index 919fbee7d4d..0e7a226d0bd 100644 --- a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql +++ b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql @@ -293,6 +293,9 @@ create table llx_c_type_resource active tinyint DEFAULT 1 NOT NULL )ENGINE=innodb; +-- Fix llx_c_type_resource when you update from a 3.6-beta +ALTER TABLE llx_c_type_resource CHANGE libelle label VARCHAR(64) NOT NULL; + ALTER TABLE llx_c_type_resource ADD UNIQUE INDEX uk_c_type_resource_id (label, code); -- Fix :: account_parent must be an int, not an account number