Updates and improves code for Xorg/AX directory merge.

[platal.git] / modules / fusionax / Adresses.sql

diff --git a/modules/fusionax/Adresses.sql b/modules/fusionax/Adresses.sql
index 172e071..f7d31a8 100644 (file)
--- a/modules/fusionax/Adresses.sql
+++ b/modules/fusionax/Adresses.sql
@@ -7,28 +7,28 @@ CREATE TABLE IF NOT EXISTS fusionax_adresses (
   id_ancien VARCHAR(8) NOT NULL COMMENT 'Id unique de l''ancien',
   Type_adr ENUM('E', 'P') character set binary NOT NULL DEFAULT 'P' COMMENT 'Type d''adresse : E pour Entreprise, P pour Personnelle',
   hash_adresse BINARY(5) NOT NULL COMMENT 'Hash pour différencier les diverses adresses',
-  Ligne1 VARCHAR(90) character set utf8 NOT NULL,
-  Ligne2 VARCHAR(90) character set utf8 NOT NULL,
-  Ligne3 VARCHAR(90) character set utf8 NOT NULL,
-  code_postal VARCHAR(20) character set utf8 NOT NULL,
-  ville VARCHAR(80) character set utf8 NOT NULL,
-  zip_cedex VARCHAR(20) character set utf8 NOT NULL,
-  etat_distr VARCHAR(20) character set utf8 NOT NULL,
-  pays VARCHAR(50) character set utf8 NOT NULL,
+  Ligne1 VARCHAR(90) NOT NULL,
+  Ligne2 VARCHAR(90) NOT NULL,
+  Ligne3 VARCHAR(90) NOT NULL,
+  code_postal VARCHAR(20) NOT NULL,
+  ville VARCHAR(80) NOT NULL,
+  zip_cedex VARCHAR(20) NOT NULL,
+  etat_distr VARCHAR(20) NOT NULL,
+  pays VARCHAR(50) NOT NULL,
   tel VARCHAR(30) NOT NULL,
   fax VARCHAR(30) NOT NULL,
   Date_maj DATE NOT NULL,
   PRIMARY KEY  (id_ancien, hash_adresse)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=InnoDB, CHARSET=utf8;
 
-LOAD DATA LOCAL INFILE 'Adresses.txt' INTO TABLE `fusionax_adresses` FIELDS TERMINATED BY '\t' LINES TERMINATED BY '\r\n'
+LOAD DATA LOCAL INFILE '{?}Adresses.txt' INTO TABLE `fusionax_adresses` FIELDS TERMINATED BY '\t' LINES TERMINATED BY '\r\n'
 (provenance, id_ancien, @Type_adr, Ligne1, Ligne2, Ligne3, code_postal, ville, zip_cedex, etat_distr, pays, tel, fax, @StringDate_maj)
 SET
 `Type_adr` = IF(@Type_adr = 'E', 'E', IF(@Type_adr = '', '', 'P')),
 `hash_adresse` = SUBSTRING( MD5( @Type_adr ), 1, 5),
 `Date_maj` = CONCAT(SUBSTRING(@StringDate_maj,7),'-',SUBSTRING(@StringDate_maj,4,2),'-',SUBSTRING(@StringDate_maj,1,2));
 
-LOAD DATA LOCAL INFILE 'Anciens.txt' INTO TABLE `fusionax_adresses` FIELDS TERMINATED BY '\t' LINES TERMINATED BY '\r\n'
+LOAD DATA LOCAL INFILE '{?}Anciens.txt' INTO TABLE `fusionax_adresses` FIELDS TERMINATED BY '\t' LINES TERMINATED BY '\r\n'
 (provenance, id_ancien, @Login, @Password, @promotion_etude, @Groupe_promo, @Nom_patronymique, @partic_patro, @prenom, @Nom_usuel, @partic_nom,
     @Nom_complet, @Civilite, @Code_nationalite, @Type_membre, @corps_sortie, @StringDate_deces, @grade, @Mel_usage, @Mel_publiable,
     @tel_mobile, @annee_dernCot, @Representant, @Type_adr, Ligne1, Ligne2, Ligne3, code_postal, ville,
@@ -38,7 +38,7 @@ SET
 `hash_adresse` = SUBSTRING( MD5( @Type_adr ), 1, 5),
 `Date_maj` = CONCAT(SUBSTRING(@StringDate_maj,7),'-',SUBSTRING(@StringDate_maj,4,2),'-',SUBSTRING(@StringDate_maj,1,2));
 
-LOAD DATA LOCAL INFILE 'Activites.txt' INTO TABLE `fusionax_adresses` FIELDS TERMINATED BY '\t' LINES TERMINATED BY '\r\n'
+LOAD DATA LOCAL INFILE '{?}Activites.txt' INTO TABLE `fusionax_adresses` FIELDS TERMINATED BY '\t' LINES TERMINATED BY '\r\n'
 (provenance, id_ancien, @Code_etab, @Raison_sociale, @Libelle_fonctio, @Annuaire,
 Ligne1, Ligne2, Ligne3, code_postal, ville, zip_cedex, etat_distr, pays, tel, fax, @StringDate_maj)
 SET