From e259ffb2a0a4f1e0cc67c8b20ff9263a3d7f8e4d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Nov 2024 23:10:18 +0100 Subject: [PATCH] Clean code --- .../install/mysql/migration/20.0.0-21.0.0.sql | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql index c67c210e06b..922cd4e5254 100644 --- a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql +++ b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql @@ -32,20 +32,6 @@ -- -- VPGSQL8.2 SELECT dol_util_rebuild_sequences(); --- new fichinter categorie -create table llx_categorie_fichinter -( - fk_categorie integer NOT NULL, - fk_fichinter integer NOT NULL, - import_key varchar(14) -)ENGINE=innodb; - -ALTER TABLE llx_categorie_fichinter ADD PRIMARY KEY pk_categorie_fichinter (fk_categorie, fk_fichinter); -ALTER TABLE llx_categorie_fichinter ADD INDEX idx_categorie_fichinter_fk_categorie (fk_categorie); -ALTER TABLE llx_categorie_fichinter ADD INDEX idx_categorie_fichinter_fk_fichinter (fk_fichinter); -ALTER TABLE llx_categorie_fichinter ADD CONSTRAINT fk_categorie_fichinter_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid); -ALTER TABLE llx_categorie_fichinter ADD CONSTRAINT fk_categorie_fichinter_fk_fichinter FOREIGN KEY (fk_fichinter) REFERENCES llx_fichinter (rowid); - -- Clean very old temporary tables (created during v9 migration or repair) DROP TABLE tmp_llx_accouting_account; @@ -65,6 +51,23 @@ ALTER TABLE llx_hrm_evaluation MODIFY COLUMN modelpdf varchar(255) DEFAULT NULL; -- V21 migration +CREATE TABLE llx_categorie_fichinter +( + fk_categorie integer NOT NULL, + fk_fichinter integer NOT NULL, + import_key varchar(14) +)ENGINE=innodb; + +-- VMYSQL4.3 ALTER TABLE llx_categorie_fichinter ADD PRIMARY KEY pk_categorie_fichinter(fk_categorie, fk_fichinter); +-- VPGSQL8.2 ALTER TABLE llx_categorie_fichinter ADD PRIMARY KEY pk_categorie_fichinter (fk_categorie, fk_fichinter); + +ALTER TABLE llx_categorie_fichinter ADD INDEX idx_categorie_fichinter_fk_categorie (fk_categorie); +ALTER TABLE llx_categorie_fichinter ADD INDEX idx_categorie_fichinter_fk_fichinter (fk_fichinter); + +ALTER TABLE llx_categorie_fichinter ADD CONSTRAINT fk_categorie_fichinter_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid); +ALTER TABLE llx_categorie_fichinter ADD CONSTRAINT fk_categorie_fichinter_fk_fichinter FOREIGN KEY (fk_fichinter) REFERENCES llx_fichinter (rowid); + + ALTER TABLE llx_blockedlog DROP INDEX entity_action; ALTER TABLE llx_blockedlog ADD INDEX entity_rowid (entity, rowid); @@ -345,4 +348,3 @@ INSERT INTO llx_c_type_contact (element, source, code, libelle, active ) values ALTER TABLE llx_facture_rec ADD COLUMN fk_societe_rib integer DEFAULT NULL; ALTER TABLE llx_facture ADD COLUMN is_also_delivery_note tinyint DEFAULT 0 NOT NULL; -