From 580a6054bab7834d8ab8ebfa4cb489d11dd2963c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Jun 2005 20:17:57 +0000 Subject: [PATCH] Fix: Suppression erreurs si install mysql 3.23.49 --- mysql/tables/llx_categorie_association.key.sql | 10 ++++++---- mysql/tables/llx_categorie_product.key.sql | 16 ++++++++-------- mysql/tables/llx_contrat.key.sql | 6 ++++-- mysql/tables/llx_contratdet.key.sql | 8 ++++---- mysql/tables/llx_facture_tva_sum.key.sql | 3 ++- mysql/tables/llx_paiement_facture.key.sql | 4 ++-- mysql/tables/llx_prelevement_facture.key.sql | 10 +++++----- mysql/tables/llx_prelevement_lignes.key.sql | 10 +++++----- .../tables/llx_product_fournisseur_price.key.sql | 7 ++++--- mysql/tables/llx_propal.key.sql | 4 +++- mysql/tables/llx_societe_remise_except.key.sql | 7 ++++--- mysql/tables/llx_user_rights.key.sql | 8 ++++---- mysql/tables/llx_usergroup_rights.key.sql | 4 +++- 13 files changed, 54 insertions(+), 43 deletions(-) diff --git a/mysql/tables/llx_categorie_association.key.sql b/mysql/tables/llx_categorie_association.key.sql index 4d93f12bbf2..1d182a6295c 100644 --- a/mysql/tables/llx_categorie_association.key.sql +++ b/mysql/tables/llx_categorie_association.key.sql @@ -1,6 +1,7 @@ -- ============================================================================ --- Copyright (C) 2005 Brice Davoleau --- Copyright (C) 2005 Matthieu Valleton +-- Copyright (C) 2005 Brice Davoleau +-- Copyright (C) 2005 Matthieu Valleton +-- Copyright (C) 2005 Laurent Destailleur -- -- 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 @@ -18,8 +19,9 @@ -- -- ============================================================================ -ALTER TABLE llx_categorie_association ADD INDEX (fk_categorie_mere); -ALTER TABLE llx_categorie_association ADD INDEX (fk_categorie_fille); + +ALTER TABLE llx_categorie_association ADD INDEX idx_categorie_association_fk_categorie_mere (fk_categorie_mere); +ALTER TABLE llx_categorie_association ADD INDEX idx_categorie_association_fk_categorie_fille (fk_categorie_fille); ALTER TABLE llx_categorie_association ADD FOREIGN KEY (fk_categorie_mere) REFERENCES llx_categorie (rowid); ALTER TABLE llx_categorie_association ADD FOREIGN KEY (fk_categorie_fille) REFERENCES llx_categorie (rowid); diff --git a/mysql/tables/llx_categorie_product.key.sql b/mysql/tables/llx_categorie_product.key.sql index 7ebb82c83e7..2e442c18959 100644 --- a/mysql/tables/llx_categorie_product.key.sql +++ b/mysql/tables/llx_categorie_product.key.sql @@ -1,6 +1,7 @@ -- ============================================================================ --- Copyright (C) 2005 Brice Davoleau --- Copyright (C) 2005 Matthieu Valleton +-- Copyright (C) 2005 Brice Davoleau +-- Copyright (C) 2005 Matthieu Valleton +-- Copyright (C) 2005 Laurent Destailleur -- -- 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 @@ -18,10 +19,9 @@ -- -- ============================================================================ -ALTER TABLE llx_categorie_product ADD INDEX (fk_categorie); -ALTER TABLE llx_categorie_product ADD INDEX (fk_product); -ALTER TABLE llx_categorie_product ADD FOREIGN KEY (fk_categorie) - REFERENCES llx_categorie (rowid); -ALTER TABLE llx_categorie_product ADD FOREIGN KEY (fk_product) - REFERENCES llx_product (rowid); +ALTER TABLE llx_categorie_product ADD INDEX idx_categorie_product_fk_categorie (fk_categorie); +ALTER TABLE llx_categorie_product ADD INDEX idx_categorie_product_fk_product (fk_product); + +ALTER TABLE llx_categorie_product ADD FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid); +ALTER TABLE llx_categorie_product ADD FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); diff --git a/mysql/tables/llx_contrat.key.sql b/mysql/tables/llx_contrat.key.sql index ef126d3d5fe..b2b17e49592 100644 --- a/mysql/tables/llx_contrat.key.sql +++ b/mysql/tables/llx_contrat.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2002-2004 Rodolphe Quiedeville --- Copyright (C) 2004 Laurent Destailleur +-- Copyright (C) 2004-2005 Laurent Destailleur -- -- 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 @@ -21,8 +21,10 @@ -- -- ============================================================================ + -- Supprimme orhpelins pour permettre montée de la clé -DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.idp WHERE llx_societe.idp IS NULL; +-- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.idp WHERE llx_societe.idp IS NULL; +-- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL; ALTER TABLE llx_contrat ADD INDEX idx_contrat_fk_soc (fk_soc); ALTER TABLE llx_contrat ADD INDEX idx_contrat_fk_user_author (fk_user_author); diff --git a/mysql/tables/llx_contratdet.key.sql b/mysql/tables/llx_contratdet.key.sql index bf8e2ef7180..19cdc5f14a0 100644 --- a/mysql/tables/llx_contratdet.key.sql +++ b/mysql/tables/llx_contratdet.key.sql @@ -1,5 +1,6 @@ -- ============================================================================ -- Copyright (C) 2004 Rodolphe Quiedeville +-- Copyright (C) 2005 Laurent Destailleur -- -- 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,14 +20,13 @@ -- $Source$ -- -- ============================================================================ --- --- + + ALTER TABLE llx_contratdet ADD INDEX idx_contratdet_fk_contrat (fk_contrat); ALTER TABLE llx_contratdet ADD INDEX idx_contratdet_fk_product (fk_product); ALTER TABLE llx_contratdet ADD INDEX idx_contratdet_date_ouverture_prevue (date_ouverture_prevue); ALTER TABLE llx_contratdet ADD INDEX idx_contratdet_date_ouverture (date_ouverture); ALTER TABLE llx_contratdet ADD INDEX idx_contratdet_date_fin_validite (date_fin_validite); --- --- + ALTER TABLE llx_contratdet ADD FOREIGN KEY (fk_contrat) REFERENCES llx_contrat (rowid); ALTER TABLE llx_contratdet ADD FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); diff --git a/mysql/tables/llx_facture_tva_sum.key.sql b/mysql/tables/llx_facture_tva_sum.key.sql index 85296b7dbe9..c5d86d57557 100644 --- a/mysql/tables/llx_facture_tva_sum.key.sql +++ b/mysql/tables/llx_facture_tva_sum.key.sql @@ -21,7 +21,8 @@ -- Supprimme orhpelins pour permettre montée de la clé -DELETE llx_facture_tva_sum FROM llx_facture_tva_sum LEFT JOIN llx_facture ON llx_facture_tva_sum.fk_facture = llx_facture.rowid WHERE llx_facture.rowid IS NULL; +-- V4 DELETE llx_facture_tva_sum FROM llx_facture_tva_sum LEFT JOIN llx_facture ON llx_facture_tva_sum.fk_facture = llx_facture.rowid WHERE llx_facture.rowid IS NULL; + ALTER TABLE llx_facture_tva_sum ADD INDEX idx_facture_tva_sum_fk_facture (fk_facture); ALTER TABLE llx_facture_tva_sum ADD CONSTRAINT facture_tva_sum_fk_facture_rowid FOREIGN KEY (fk_facture) REFERENCES llx_facture (rowid); diff --git a/mysql/tables/llx_paiement_facture.key.sql b/mysql/tables/llx_paiement_facture.key.sql index db1e1489d4b..62b9ea08c36 100644 --- a/mysql/tables/llx_paiement_facture.key.sql +++ b/mysql/tables/llx_paiement_facture.key.sql @@ -21,8 +21,8 @@ -- =========================================================================== -- Supprimme orhpelins pour permettre montée de la clé -DELETE llx_paiement_facture FROM llx_paiement_facture LEFT JOIN llx_facture ON llx_paiement_facture.fk_facture = llx_facture.rowid WHERE llx_facture.rowid IS NULL; -DELETE llx_paiement_facture FROM llx_paiement_facture LEFT JOIn llx_paiement ON llx_paiement_facture.fk_facture = llx_paiement.rowid WHERE llx_paiement.rowid IS NULL; +-- V4 DELETE llx_paiement_facture FROM llx_paiement_facture LEFT JOIN llx_facture ON llx_paiement_facture.fk_facture = llx_facture.rowid WHERE llx_facture.rowid IS NULL; +-- V4 DELETE llx_paiement_facture FROM llx_paiement_facture LEFT JOIn llx_paiement ON llx_paiement_facture.fk_facture = llx_paiement.rowid WHERE llx_paiement.rowid IS NULL; ALTER TABLE llx_paiement_facture ADD INDEX idx_paiement_facture_fk_facture (fk_facture); ALTER TABLE llx_paiement_facture ADD CONSTRAINT paiement_facture_fk_facture FOREIGN KEY (fk_facture) REFERENCES llx_facture (rowid); diff --git a/mysql/tables/llx_prelevement_facture.key.sql b/mysql/tables/llx_prelevement_facture.key.sql index 172aac33ebf..44a9c5acdbe 100644 --- a/mysql/tables/llx_prelevement_facture.key.sql +++ b/mysql/tables/llx_prelevement_facture.key.sql @@ -1,5 +1,6 @@ -- ============================================================================ -- Copyright (C) 2005 Rodolphe Quiedeville +-- Copyright (C) 2005 Laurent Destailleur -- -- 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 @@ -20,10 +21,9 @@ -- -- ============================================================================ --- --- -ALTER TABLE llx_prelevement_facture ADD INDEX (fk_prelevement_lignes); --- --- + +ALTER TABLE llx_prelevement_facture ADD INDEX idx_prelevement_facture_fk_prelevement_lignes (fk_prelevement_lignes); + + ALTER TABLE llx_prelevement_facture ADD FOREIGN KEY (fk_prelevement_lignes) REFERENCES llx_prelevement_lignes (rowid); diff --git a/mysql/tables/llx_prelevement_lignes.key.sql b/mysql/tables/llx_prelevement_lignes.key.sql index 844bded981b..a7d49fe169e 100644 --- a/mysql/tables/llx_prelevement_lignes.key.sql +++ b/mysql/tables/llx_prelevement_lignes.key.sql @@ -1,5 +1,6 @@ -- ============================================================================ -- Copyright (C) 2005 Rodolphe Quiedeville +-- Copyright (C) 2005 Laurent Destailleur -- -- 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 @@ -20,10 +21,9 @@ -- -- ============================================================================ --- --- -ALTER TABLE llx_prelevement_lignes ADD INDEX (fk_prelevement_bons); --- --- + +ALTER TABLE llx_prelevement_lignes ADD INDEX idx_prelevement_lignes_fk_prelevement_bons (fk_prelevement_bons); + + ALTER TABLE llx_prelevement_lignes ADD FOREIGN KEY (fk_prelevement_bons) REFERENCES llx_prelevement_bons (rowid); diff --git a/mysql/tables/llx_product_fournisseur_price.key.sql b/mysql/tables/llx_product_fournisseur_price.key.sql index 2b54010be45..bd641fc4206 100644 --- a/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/mysql/tables/llx_product_fournisseur_price.key.sql @@ -1,5 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville +-- Copyright (C) 2005 Laurent Destailleur -- -- 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 @@ -21,9 +22,9 @@ -- ============================================================================ -ALTER TABLE llx_product_fournisseur_price ADD INDEX idx_fk_user (fk_user); -ALTER TABLE llx_product_fournisseur_price ADD INDEX idx_fk_soc (fk_soc); -ALTER TABLE llx_product_fournisseur_price ADD INDEX idx_fk_product (fk_product); +ALTER TABLE llx_product_fournisseur_price ADD INDEX idx_product_fournisseur_price_fk_user (fk_user); +ALTER TABLE llx_product_fournisseur_price ADD INDEX idx_product_fournisseur_price_fk_soc (fk_soc); +ALTER TABLE llx_product_fournisseur_price ADD INDEX idx_product_fournisseur_price_fk_product (fk_product); ALTER TABLE llx_product_fournisseur_price ADD FOREIGN KEY (fk_user) REFERENCES llx_user (rowid); ALTER TABLE llx_product_fournisseur_price ADD FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp); diff --git a/mysql/tables/llx_propal.key.sql b/mysql/tables/llx_propal.key.sql index b4ad6882c63..f1971896694 100644 --- a/mysql/tables/llx_propal.key.sql +++ b/mysql/tables/llx_propal.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2002-2004 Rodolphe Quiedeville --- Copyright (C) 2004 Laurent Destailleur +-- Copyright (C) 2004-2005 Laurent Destailleur -- -- 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 @@ -23,5 +23,7 @@ ALTER TABLE llx_propal ADD INDEX idx_propal_fk_soc (fk_soc); + + ALTER TABLE llx_propal ADD FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp); diff --git a/mysql/tables/llx_societe_remise_except.key.sql b/mysql/tables/llx_societe_remise_except.key.sql index 837e82012a7..69d4ebe5e6a 100644 --- a/mysql/tables/llx_societe_remise_except.key.sql +++ b/mysql/tables/llx_societe_remise_except.key.sql @@ -1,5 +1,6 @@ -- ============================================================================ -- Copyright (C) 2004 Rodolphe Quiedeville +-- Copyright (C) 2005 Laurent Destailleur -- -- 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 @@ -24,10 +25,10 @@ -- ============================================================================ +ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_user (fk_user); +ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_soc (fk_soc); +ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_facture (fk_facture); -ALTER TABLE llx_societe_remise_except ADD INDEX (fk_user); -ALTER TABLE llx_societe_remise_except ADD INDEX (fk_soc); -ALTER TABLE llx_societe_remise_except ADD INDEX (fk_facture); ALTER TABLE llx_societe_remise_except ADD FOREIGN KEY (fk_user) REFERENCES llx_user (rowid); ALTER TABLE llx_societe_remise_except ADD FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp); diff --git a/mysql/tables/llx_user_rights.key.sql b/mysql/tables/llx_user_rights.key.sql index d9aa1f9d508..f41efcfcf9d 100644 --- a/mysql/tables/llx_user_rights.key.sql +++ b/mysql/tables/llx_user_rights.key.sql @@ -1,5 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville +-- Copyright (C) 2005 Laurent Destailleur -- -- 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 @@ -20,10 +21,9 @@ -- -- =========================================================================== + -- Supprimme orhpelins pour permettre montée de la clé -delete llx_user_rights -from llx_user_rights -left join llx_user on llx_user_rights.fk_user = llx_user.rowid -where llx_user.rowid is null; +DELETE llx_user_rights FROM llx_user_rights LEFT JOIN llx_user ON llx_user_rights.fk_user = llx_user.rowid WHERE llx_user.rowid IS NULL; + ALTER TABLE llx_user_rights ADD FOREIGN KEY (fk_user) REFERENCES llx_user (rowid); diff --git a/mysql/tables/llx_usergroup_rights.key.sql b/mysql/tables/llx_usergroup_rights.key.sql index 467d87f138f..a344afa202b 100644 --- a/mysql/tables/llx_usergroup_rights.key.sql +++ b/mysql/tables/llx_usergroup_rights.key.sql @@ -20,7 +20,9 @@ -- -- =========================================================================== + -- Supprime orhpelins pour permettre montée de la clé -DELETE llx_usergroup_rights FROM llx_usergroup_rights LEFT JOIN llx_usergroup ON llx_usergroup_rights.fk_usergroup = llx_usergroup.rowid WHERE llx_usergroup.rowid IS NULL; +-- V4 DELETE llx_usergroup_rights FROM llx_usergroup_rights LEFT JOIN llx_usergroup ON llx_usergroup_rights.fk_usergroup = llx_usergroup.rowid WHERE llx_usergroup.rowid IS NULL; + ALTER TABLE llx_usergroup_rights ADD FOREIGN KEY (fk_usergroup) REFERENCES llx_usergroup (rowid);