From 40adaf716d192607ab1843b9c2802415c02ac75f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 22 Oct 2015 10:33:42 +0200 Subject: [PATCH] Uniformize index names --- htdocs/install/mysql/migration/3.8.0-3.9.0.sql | 8 ++++++-- htdocs/install/mysql/tables/llx_ecm_files.key.sql | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql index d6378a06c6d..b97c9a99fe9 100755 --- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql +++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql @@ -71,6 +71,11 @@ ALTER TABLE llx_contrat ADD COLUMN ref_customer varchar(30); ALTER TABLE llx_ecm_directories MODIFY COLUMN fullpath varchar(750); +ALTER TABLE llx_ecm_directories DROP INDEX idx_ecm_directories; +ALTER TABLE llx_ecm_directories ADD UNIQUE INDEX uk_ecm_directories (label, fk_parent, entity); +ALTER TABLE llx_ecm_directories ADD UNIQUE INDEX uk_ecm_directories_fullpath(fullpath); + + CREATE TABLE llx_ecm_files ( rowid integer AUTO_INCREMENT PRIMARY KEY, @@ -90,8 +95,7 @@ CREATE TABLE llx_ecm_files acl text -- for future permission 'per file' ) ENGINE=innodb; - -ALTER TABLE llx_ecm_directories ADD UNIQUE INDEX uk_ecm_directories_fullpath(fullpath); +ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files (label, entity); ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files_fullpath(fullpath); diff --git a/htdocs/install/mysql/tables/llx_ecm_files.key.sql b/htdocs/install/mysql/tables/llx_ecm_files.key.sql index b689bf0b0fb..81cc769d6cd 100644 --- a/htdocs/install/mysql/tables/llx_ecm_files.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_files.key.sql @@ -17,4 +17,5 @@ -- ============================================================================ +ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files (label, entity); ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files_fullpath(fullpath);