From 61159ca2206f24acd9ccee30ea85345f270107f5 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 9 Sep 2012 22:05:53 +0200 Subject: [PATCH] Fix: use specific hash for ref --- htdocs/install/mysql/migration/3.2.0-3.3.0.sql | 6 ++++-- htdocs/install/mysql/tables/llx_ecm_documents.key.sql | 3 +-- htdocs/install/mysql/tables/llx_ecm_documents.sql | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index 99a947c2510..a3499ec2de7 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -101,6 +101,8 @@ ALTER TABLE llx_ecm_directories ADD INDEX idx_ecm_directories_fk_user_m (fk_user ALTER TABLE llx_ecm_directories ADD CONSTRAINT fk_ecm_directories_fk_user_c FOREIGN KEY (fk_user_c) REFERENCES llx_user (rowid); ALTER TABLE llx_ecm_directories ADD CONSTRAINT fk_ecm_directories_fk_user_m FOREIGN KEY (fk_user_m) REFERENCES llx_user (rowid); +ALTER TABLE llx_ecm_documents DROP FOREIGN KEY fk_ecm_documents_fk_directory; +ALTER TABLE llx_ecm_documents DROP INDEX idx_ecm_documents_ref; ALTER TABLE llx_ecm_documents DROP INDEX idx_ecm_documents; ALTER TABLE llx_ecm_documents DROP COLUMN manualkeyword; ALTER TABLE llx_ecm_documents DROP COLUMN fullpath_orig; @@ -109,14 +111,14 @@ ALTER TABLE llx_ecm_documents DROP COLUMN crc; ALTER TABLE llx_ecm_documents DROP COLUMN cryptkey; ALTER TABLE llx_ecm_documents DROP COLUMN cipher; ALTER TABLE llx_ecm_documents CHANGE COLUMN fullpath_dol fullpath text; +ALTER TABLE llx_ecm_documents MODIFY COLUMN ref varchar(32) NOT NULL; ALTER TABLE llx_ecm_documents MODIFY COLUMN fullpath text; ALTER TABLE llx_ecm_documents MODIFY COLUMN filemime varchar(128) NOT NULL; ALTER TABLE llx_ecm_documents ADD COLUMN metadata text after description; ALTER TABLE llx_ecm_documents ADD COLUMN extraparams varchar(255) AFTER fk_directory; -ALTER TABLE llx_ecm_documents ADD UNIQUE INDEX idx_ecm_documents_ref (ref, fk_directory, entity); +ALTER TABLE llx_ecm_documents ADD UNIQUE INDEX idx_ecm_documents_ref (ref, entity); ALTER TABLE llx_ecm_documents ADD INDEX idx_ecm_documents_fk_create (fk_create); ALTER TABLE llx_ecm_documents ADD INDEX idx_ecm_documents_fk_update (fk_update); -ALTER TABLE llx_ecm_documents ADD CONSTRAINT fk_ecm_documents_fk_directory FOREIGN KEY (fk_directory) REFERENCES llx_ecm_directories (rowid); ALTER TABLE llx_ecm_documents ADD CONSTRAINT fk_ecm_documents_fk_create FOREIGN KEY (fk_create) REFERENCES llx_user (rowid); ALTER TABLE llx_ecm_documents ADD CONSTRAINT fk_ecm_documents_fk_update FOREIGN KEY (fk_update) REFERENCES llx_user (rowid); diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql index a29292dea1c..0f7616d8a59 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql @@ -18,11 +18,10 @@ -- ============================================================================ -ALTER TABLE llx_ecm_documents ADD UNIQUE INDEX idx_ecm_documents_ref (ref, fk_directory, entity); +ALTER TABLE llx_ecm_documents ADD UNIQUE INDEX idx_ecm_documents_ref (ref, entity); ALTER TABLE llx_ecm_documents ADD INDEX idx_ecm_documents_fk_create (fk_create); ALTER TABLE llx_ecm_documents ADD INDEX idx_ecm_documents_fk_update (fk_update); -ALTER TABLE llx_ecm_documents ADD CONSTRAINT fk_ecm_documents_fk_directory FOREIGN KEY (fk_directory) REFERENCES llx_ecm_directories (rowid); ALTER TABLE llx_ecm_documents ADD CONSTRAINT fk_ecm_documents_fk_create FOREIGN KEY (fk_create) REFERENCES llx_user (rowid); ALTER TABLE llx_ecm_documents ADD CONSTRAINT fk_ecm_documents_fk_update FOREIGN KEY (fk_update) REFERENCES llx_user (rowid); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql index 7a3440e5649..148fec437f2 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql @@ -21,16 +21,16 @@ create table llx_ecm_documents ( rowid integer AUTO_INCREMENT PRIMARY KEY, - ref varchar(16) NOT NULL, entity integer DEFAULT 1 NOT NULL, + ref varchar(32) NOT NULL, -- hash(fullpath + filename + version) filename varchar(255) NOT NULL, filesize integer NOT NULL, - filemime varchar(128) NOT NULL, + filemime varchar(128) NOT NULL, description text, - metadata text, + metadata text, -- Secure file information (json format / encrypted) fullpath text, fk_directory integer, - extraparams varchar(255), -- for stock other parameters with json format + extraparams varchar(255), -- Other parameters (json format) fk_create integer NOT NULL, fk_update integer, date_c datetime NOT NULL,