From 1b7fbc46f90f99610aceaee0cdbe8d8598a060e5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur <eldy@users.sourceforge.net> Date: Sat, 17 Oct 2009 14:02:15 +0000 Subject: [PATCH] Fix: Primary key must be named pk_tablename --- htdocs/install/mysql/migration/2.6.0-2.7.0.sql | 10 +++++++--- htdocs/install/mysql/tables/llx_boxes_def.key.sql | 3 ++- .../install/mysql/tables/llx_dolibarr_modules.key.sql | 2 +- htdocs/install/mysql/tables/llx_rights_def.key.sql | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/htdocs/install/mysql/migration/2.6.0-2.7.0.sql b/htdocs/install/mysql/migration/2.6.0-2.7.0.sql index 0c93f205b71..b87384640d9 100644 --- a/htdocs/install/mysql/migration/2.6.0-2.7.0.sql +++ b/htdocs/install/mysql/migration/2.6.0-2.7.0.sql @@ -132,6 +132,8 @@ ALTER TABLE llx_prelevement_bons ADD COLUMN entity integer DEFAULT 1 NOT NULL AF ALTER TABLE llx_projet ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref; ALTER TABLE llx_rights_def DROP PRIMARY KEY; +ALTER TABLE llx_dolibarr_modules DROP PRIMARY KEY; + ALTER TABLE llx_user_param DROP INDEX fk_user; ALTER TABLE llx_societe DROP INDEX uk_societe_prefix_comm; ALTER TABLE llx_societe DROP INDEX uk_societe_code_client; @@ -152,11 +154,13 @@ ALTER TABLE llx_facture_fourn DROP INDEX uk_facture_fourn_ref; ALTER TABLE llx_livraison DROP INDEX idx_expedition_uk_ref; ALTER TABLE llx_livraison DROP INDEX idx_livraison_uk_ref; ALTER TABLE llx_fichinter DROP INDEX ref; -ALTER TABLE llx_dolibarr_modules DROP PRIMARY KEY; ALTER TABLE llx_prelevement_bons DROP INDEX ref; ALTER TABLE llx_projet DROP INDEX ref; +ALTER TABLE llx_boxes_def DROP INDEX uk_boxes_def; + +ALTER TABLE llx_rights_def ADD PRIMARY KEY pk_rights_def (id, entity); +ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); -ALTER TABLE llx_rights_def ADD PRIMARY KEY (id, entity); ALTER TABLE llx_user_param ADD UNIQUE INDEX uk_user_param (fk_user,param,entity); ALTER TABLE llx_societe ADD UNIQUE INDEX uk_societe_prefix_comm (prefix_comm, entity); ALTER TABLE llx_societe ADD UNIQUE INDEX uk_societe_code_client (code_client, entity); @@ -178,10 +182,10 @@ ALTER TABLE llx_facture_fourn ADD UNIQUE INDEX uk_facture_fourn_ref (facnumber, ALTER TABLE llx_livraison ADD UNIQUE INDEX idx_livraison_uk_ref (ref, entity); ALTER TABLE llx_fichinter ADD UNIQUE INDEX uk_fichinter_ref (ref, entity); ALTER TABLE llx_contrat ADD UNIQUE INDEX uk_contrat_ref (ref, entity); -ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); ALTER TABLE llx_bordereau_cheque ADD UNIQUE INDEX uk_bordereau_cheque (number, entity); ALTER TABLE llx_prelevement_bons ADD UNIQUE INDEX uk_prelevement_bons_ref (ref, entity); ALTER TABLE llx_projet ADD UNIQUE INDEX uk_projet_ref (ref, entity); +ALTER TABLE llx_boxes_def ADD UNIQUE INDEX uk_boxes_def (file, entity); ALTER TABLE llx_projet ADD INDEX idx_projet_fk_soc (fk_soc); ALTER TABLE llx_projet ADD CONSTRAINT fk_projet_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index cdd4485c527..70192090600 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -1,5 +1,6 @@ -- ============================================================================ -- Copyright (C) 2009 Regis Houssin <regis@dolibarr.fr> +-- Copyright (C) 2009 Laurent Destailleur <eldy@users.sourceforge.net> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -19,4 +20,4 @@ -- =========================================================================== -ALTER TABLE llx_boxes_def ADD PRIMARY KEY(rowid, entity); \ No newline at end of file +ALTER TABLE llx_boxes_def ADD UNIQUE INDEX uk_boxes_def (file, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql index 1157928e31d..92458721321 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql @@ -19,4 +19,4 @@ -- =========================================================================== -ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY uk_dolibarr_modules (numero, entity); +ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql index 7e87b4e7da8..b8453ea821c 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.key.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.key.sql @@ -19,4 +19,4 @@ -- =========================================================================== -ALTER TABLE llx_rights_def ADD PRIMARY KEY(id, entity); \ No newline at end of file +ALTER TABLE llx_rights_def ADD PRIMARY KEY pk_rights_def (id, entity); \ No newline at end of file -- GitLab