From 739a82d69c1fde94d00d82aed03e82aff6f46da3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 8 Oct 2005 17:28:14 +0000 Subject: [PATCH] Qual: Normalisation des noms de contraintes foreign keys --- mysql/tables/llx_accountingsystem_det.key.sql | 2 +- mysql/tables/llx_c_regions.key.sql | 2 +- mysql/tables/llx_categorie_association.key.sql | 4 ++-- mysql/tables/llx_contratdet.key.sql | 4 ++-- mysql/tables/llx_element_contact.key.sql | 2 +- mysql/tables/llx_facture.key.sql | 8 ++++---- mysql/tables/llx_facture_fourn.key.sql | 8 ++++---- mysql/tables/llx_facture_tva_sum.key.sql | 2 +- mysql/tables/llx_facturedet.key.sql | 2 +- mysql/tables/llx_fichinter.key.sql | 2 +- mysql/tables/llx_paiement_facture.key.sql | 4 ++-- mysql/tables/llx_prelevement_facture.key.sql | 2 +- mysql/tables/llx_prelevement_lignes.key.sql | 2 +- mysql/tables/llx_product_fournisseur_price.key.sql | 6 +++--- mysql/tables/llx_propal.key.sql | 2 +- mysql/tables/llx_societe_remise_except.key.sql | 6 +++--- mysql/tables/llx_socpeople.key.sql | 2 +- mysql/tables/llx_user_rights.key.sql | 2 +- mysql/tables/llx_usergroup_rights.key.sql | 2 +- 19 files changed, 32 insertions(+), 32 deletions(-) diff --git a/mysql/tables/llx_accountingsystem_det.key.sql b/mysql/tables/llx_accountingsystem_det.key.sql index 48791f048bc..3053dd71c7d 100644 --- a/mysql/tables/llx_accountingsystem_det.key.sql +++ b/mysql/tables/llx_accountingsystem_det.key.sql @@ -25,4 +25,4 @@ ALTER TABLE llx_accountingsystem_det ADD INDEX idx_accountingsystem_det_fk_pcg_version (fk_pcg_version); -ALTER TABLE llx_accountingsystem_det ADD FOREIGN KEY (fk_pcg_version) REFERENCES llx_accountingsystem (pcg_version); +ALTER TABLE llx_accountingsystem_det ADD CONSTRAINT fk_accountingsystem_det_fk_pcg_version FOREIGN KEY (fk_pcg_version) REFERENCES llx_accountingsystem (pcg_version); diff --git a/mysql/tables/llx_c_regions.key.sql b/mysql/tables/llx_c_regions.key.sql index ceba9c65b8d..6cdbb111925 100644 --- a/mysql/tables/llx_c_regions.key.sql +++ b/mysql/tables/llx_c_regions.key.sql @@ -22,4 +22,4 @@ ALTER TABLE llx_c_regions ADD INDEX idx_c_regions_fk_pays (fk_pays); -ALTER TABLE llx_c_regions ADD CONSTRAINT c_regions_fk_pays FOREIGN KEY (fk_pays) REFERENCES llx_c_pays (rowid); +ALTER TABLE llx_c_regions ADD CONSTRAINT fk_c_regions_fk_pays FOREIGN KEY (fk_pays) REFERENCES llx_c_pays (rowid); diff --git a/mysql/tables/llx_categorie_association.key.sql b/mysql/tables/llx_categorie_association.key.sql index 1d182a6295c..aac84cf9d8b 100644 --- a/mysql/tables/llx_categorie_association.key.sql +++ b/mysql/tables/llx_categorie_association.key.sql @@ -23,5 +23,5 @@ 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); +ALTER TABLE llx_categorie_association ADD CONSTRAINT fk_categorie_asso_fk_categorie_mere FOREIGN KEY (fk_categorie_mere) REFERENCES llx_categorie (rowid); +ALTER TABLE llx_categorie_association ADD CONSTRAINT fk_categorie_asso_fk_categorie_fille FOREIGN KEY (fk_categorie_fille) REFERENCES llx_categorie (rowid); diff --git a/mysql/tables/llx_contratdet.key.sql b/mysql/tables/llx_contratdet.key.sql index 19cdc5f14a0..675a337cb86 100644 --- a/mysql/tables/llx_contratdet.key.sql +++ b/mysql/tables/llx_contratdet.key.sql @@ -28,5 +28,5 @@ ALTER TABLE llx_contratdet ADD INDEX idx_contratdet_date_ouverture_prevue (date_ 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); +ALTER TABLE llx_contratdet ADD CONSTRAINT fk_contratdet_fk_contrat FOREIGN KEY (fk_contrat) REFERENCES llx_contrat (rowid); +ALTER TABLE llx_contratdet ADD CONSTRAINT fk_contratdet_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); diff --git a/mysql/tables/llx_element_contact.key.sql b/mysql/tables/llx_element_contact.key.sql index 67f74c58b62..d52a873b7da 100644 --- a/mysql/tables/llx_element_contact.key.sql +++ b/mysql/tables/llx_element_contact.key.sql @@ -25,5 +25,5 @@ ALTER TABLE llx_element_contact ADD UNIQUE INDEX idx_element_contact_idx1 (element_id, fk_c_type_contact, fk_socpeople); ALTER TABLE llx_element_contact - ADD CONSTRAINT idx_element_contact_fk_c_type_contact + ADD CONSTRAINT fk_element_contact_fk_c_type_contact FOREIGN KEY (fk_c_type_contact) REFERENCES llx_c_type_contact(rowid); diff --git a/mysql/tables/llx_facture.key.sql b/mysql/tables/llx_facture.key.sql index c0fec2eedf7..8e101198d63 100644 --- a/mysql/tables/llx_facture.key.sql +++ b/mysql/tables/llx_facture.key.sql @@ -27,7 +27,7 @@ ALTER TABLE llx_facture ADD INDEX idx_facture_fk_user_author (fk_user_author); ALTER TABLE llx_facture ADD INDEX idx_facture_fk_user_valid (fk_user_valid); ALTER TABLE llx_facture ADD INDEX idx_facture_fk_projet (fk_projet); -ALTER TABLE llx_facture ADD FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp); -ALTER TABLE llx_facture ADD FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid); -ALTER TABLE llx_facture ADD FOREIGN KEY (fk_user_valid) REFERENCES llx_user (rowid); -ALTER TABLE llx_facture ADD FOREIGN KEY (fk_projet) REFERENCES llx_projet (rowid); +ALTER TABLE llx_facture ADD CONSTRAINT fk_facture_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp); +ALTER TABLE llx_facture ADD CONSTRAINT fk_facture_fk_user_author FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid); +ALTER TABLE llx_facture ADD CONSTRAINT fk_facture_fk_user_valid FOREIGN KEY (fk_user_valid) REFERENCES llx_user (rowid); +ALTER TABLE llx_facture ADD CONSTRAINT fk_facture_fk_projet FOREIGN KEY (fk_projet) REFERENCES llx_projet (rowid); diff --git a/mysql/tables/llx_facture_fourn.key.sql b/mysql/tables/llx_facture_fourn.key.sql index 55409bb2037..86d9224e59a 100644 --- a/mysql/tables/llx_facture_fourn.key.sql +++ b/mysql/tables/llx_facture_fourn.key.sql @@ -26,7 +26,7 @@ ALTER TABLE llx_facture_fourn ADD INDEX idx_facture_fourn_fk_user_author (fk_use ALTER TABLE llx_facture_fourn ADD INDEX idx_facture_fourn_fk_user_valid (fk_user_valid); ALTER TABLE llx_facture_fourn ADD INDEX idx_facture_fourn_fk_projet (fk_projet); -ALTER TABLE llx_facture_fourn ADD FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp); -ALTER TABLE llx_facture_fourn ADD FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid); -ALTER TABLE llx_facture_fourn ADD FOREIGN KEY (fk_user_valid) REFERENCES llx_user (rowid); -ALTER TABLE llx_facture_fourn ADD FOREIGN KEY (fk_projet) REFERENCES llx_projet (rowid); +ALTER TABLE llx_facture_fourn ADD CONSTRAINT fk_facture_fourn_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp); +ALTER TABLE llx_facture_fourn ADD CONSTRAINT fk_facture_fourn_fk_user_author FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid); +ALTER TABLE llx_facture_fourn ADD CONSTRAINT fk_facture_fourn_fk_user_valid FOREIGN KEY (fk_user_valid) REFERENCES llx_user (rowid); +ALTER TABLE llx_facture_fourn ADD CONSTRAINT fk_facture_fourn_fk_projet FOREIGN KEY (fk_projet) REFERENCES llx_projet (rowid); diff --git a/mysql/tables/llx_facture_tva_sum.key.sql b/mysql/tables/llx_facture_tva_sum.key.sql index c5d86d57557..0a25d32be8e 100644 --- a/mysql/tables/llx_facture_tva_sum.key.sql +++ b/mysql/tables/llx_facture_tva_sum.key.sql @@ -25,4 +25,4 @@ 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); +ALTER TABLE llx_facture_tva_sum ADD CONSTRAINT fk_facture_tva_sum_fk_facture FOREIGN KEY (fk_facture) REFERENCES llx_facture (rowid); diff --git a/mysql/tables/llx_facturedet.key.sql b/mysql/tables/llx_facturedet.key.sql index 05b84095ae3..c4222b4ec70 100644 --- a/mysql/tables/llx_facturedet.key.sql +++ b/mysql/tables/llx_facturedet.key.sql @@ -24,4 +24,4 @@ DELETE llx_facturedet FROM llx_facturedet LEFT JOIN llx_facture ON llx_facturedet.fk_facture = llx_facture.rowid WHERE llx_facture.rowid IS NULL; ALTER TABLE llx_facturedet ADD INDEX idx_facturedet_fk_facture (fk_facture); -ALTER TABLE llx_facturedet ADD CONSTRAINT facturedet_fk_facture_rowid FOREIGN KEY (fk_facture) REFERENCES llx_facture (rowid); +ALTER TABLE llx_facturedet ADD CONSTRAINT fk_facturedet_fk_facture FOREIGN KEY (fk_facture) REFERENCES llx_facture (rowid); diff --git a/mysql/tables/llx_fichinter.key.sql b/mysql/tables/llx_fichinter.key.sql index 7e17c62ba1d..e160d8dd91e 100644 --- a/mysql/tables/llx_fichinter.key.sql +++ b/mysql/tables/llx_fichinter.key.sql @@ -22,4 +22,4 @@ ALTER TABLE llx_fichinter ADD INDEX idx_fichinter_fk_soc (fk_soc); -ALTER TABLE llx_fichinter ADD CONSTRAINT fichinter_fk_soc_idp FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp); +ALTER TABLE llx_fichinter ADD CONSTRAINT fk_fichinter_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp); diff --git a/mysql/tables/llx_paiement_facture.key.sql b/mysql/tables/llx_paiement_facture.key.sql index 62b9ea08c36..4e54282da7b 100644 --- a/mysql/tables/llx_paiement_facture.key.sql +++ b/mysql/tables/llx_paiement_facture.key.sql @@ -25,7 +25,7 @@ -- 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); +ALTER TABLE llx_paiement_facture ADD CONSTRAINT fk_paiement_facture_fk_facture FOREIGN KEY (fk_facture) REFERENCES llx_facture (rowid); ALTER TABLE llx_paiement_facture ADD INDEX idx_paiement_facture_fk_paiement (fk_paiement); -ALTER TABLE llx_paiement_facture ADD CONSTRAINT paiement_facture_fk_paiement FOREIGN KEY (fk_paiement) REFERENCES llx_paiement (rowid); +ALTER TABLE llx_paiement_facture ADD CONSTRAINT fk_paiement_facture_fk_paiement FOREIGN KEY (fk_paiement) REFERENCES llx_paiement (rowid); diff --git a/mysql/tables/llx_prelevement_facture.key.sql b/mysql/tables/llx_prelevement_facture.key.sql index 44a9c5acdbe..85422ccf0b3 100644 --- a/mysql/tables/llx_prelevement_facture.key.sql +++ b/mysql/tables/llx_prelevement_facture.key.sql @@ -25,5 +25,5 @@ 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); +ALTER TABLE llx_prelevement_facture ADD CONSTRAINT fk_prelevement_facture_fk_prelevement_lignes 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 a7d49fe169e..21c5260099f 100644 --- a/mysql/tables/llx_prelevement_lignes.key.sql +++ b/mysql/tables/llx_prelevement_lignes.key.sql @@ -25,5 +25,5 @@ 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); +ALTER TABLE llx_prelevement_lignes ADD CONSTRAINT fk_prelevement_lignes_fk_prelevement_bons 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 bd641fc4206..b73df53e63c 100644 --- a/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/mysql/tables/llx_product_fournisseur_price.key.sql @@ -26,8 +26,8 @@ ALTER TABLE llx_product_fournisseur_price ADD INDEX idx_product_fournisseur_pric 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); -ALTER TABLE llx_product_fournisseur_price ADD FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); +ALTER TABLE llx_product_fournisseur_price ADD CONSTRAINT fk_product_fournisseur_price_fk_user FOREIGN KEY (fk_user) REFERENCES llx_user (rowid); +ALTER TABLE llx_product_fournisseur_price ADD CONSTRAINT fk_product_fournisseur_price_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp); +ALTER TABLE llx_product_fournisseur_price ADD CONSTRAINT fk_product_fournisseur_price_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); diff --git a/mysql/tables/llx_propal.key.sql b/mysql/tables/llx_propal.key.sql index f1971896694..9391b8c70d2 100644 --- a/mysql/tables/llx_propal.key.sql +++ b/mysql/tables/llx_propal.key.sql @@ -25,5 +25,5 @@ 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); +ALTER TABLE llx_propal ADD CONSTRAINT fk_propal_fk_soc 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 69d4ebe5e6a..8f45b069a84 100644 --- a/mysql/tables/llx_societe_remise_except.key.sql +++ b/mysql/tables/llx_societe_remise_except.key.sql @@ -30,9 +30,9 @@ ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_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 FOREIGN KEY (fk_user) REFERENCES llx_user (rowid); -ALTER TABLE llx_societe_remise_except ADD FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp); -ALTER TABLE llx_societe_remise_except ADD FOREIGN KEY (fk_facture) REFERENCES llx_facture (rowid); +ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_user FOREIGN KEY (fk_user) REFERENCES llx_user (rowid); +ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp); +ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_facture FOREIGN KEY (fk_facture) REFERENCES llx_facture (rowid); diff --git a/mysql/tables/llx_socpeople.key.sql b/mysql/tables/llx_socpeople.key.sql index 2b6c4ecaed5..eb5f4707761 100644 --- a/mysql/tables/llx_socpeople.key.sql +++ b/mysql/tables/llx_socpeople.key.sql @@ -22,4 +22,4 @@ ALTER TABLE llx_socpeople ADD INDEX idx_socpeople_fk_soc (fk_soc); -ALTER TABLE llx_socpeople ADD CONSTRAINT socpeople_fk_soc_idp FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp); +ALTER TABLE llx_socpeople ADD CONSTRAINT fk_socpeople_fk_soc 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 f41efcfcf9d..edf01f37958 100644 --- a/mysql/tables/llx_user_rights.key.sql +++ b/mysql/tables/llx_user_rights.key.sql @@ -26,4 +26,4 @@ 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); +ALTER TABLE llx_user_rights ADD CONSTRAINT fk_user_rights_fk_user_user 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 a344afa202b..79278bc8228 100644 --- a/mysql/tables/llx_usergroup_rights.key.sql +++ b/mysql/tables/llx_usergroup_rights.key.sql @@ -25,4 +25,4 @@ -- 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); +ALTER TABLE llx_usergroup_rights ADD CONSTRAINT fk_usergroup_rights_fk_usergroup FOREIGN KEY (fk_usergroup) REFERENCES llx_usergroup (rowid);