Merge remote branch 'origin/platal-1.0.1'

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

diff --git a/modules/fusionax/Activites.sql b/modules/fusionax/Activites.sql
index b436100..e412b15 100644 (file)
--- a/modules/fusionax/Activites.sql
+++ b/modules/fusionax/Activites.sql
@@ -9,12 +9,22 @@ CREATE TABLE IF NOT EXISTS `fusionax_activites` (
   `Raison_sociale` VARCHAR(255) NOT NULL COMMENT 'Raison sociale de l''établissement',
   `Libelle_fonctio` VARCHAR(255) NOT NULL COMMENT 'Libéllé de la fonction',
   `Annuaire` BOOLEAN NOT NULL COMMENT 'publiable dans l''annuaire papier',
-  PRIMARY KEY( `ax_id` , `Code_etab` )
+  pid INT(11) UNSIGNED DEFAULT NULL,
+  jobid INT(6) UNSIGNED DEFAULT NULL,
+  description VARCHAR(255) DEFAULT NULL,
+  PRIMARY KEY (`ax_id`, `Code_etab`),
+  INDEX (Code_etab),
+  INDEX (pid),
+  INDEX (jobid)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-LOAD DATA LOCAL INFILE '{?}Activites.txt' INTO TABLE `fusionax_activites` FIELDS TERMINATED BY '\t' LINES TERMINATED BY '\r\n'
+LOAD DATA LOCAL INFILE '{?}Activites.txt' INTO TABLE `fusionax_activites` CHARACTER SET utf8 FIELDS TERMINATED BY '\t' LINES TERMINATED BY '\r\n'
 (AC, ax_id, Code_etab, Raison_sociale, Libelle_fonctio, Annuaire,
 @Ligne1, @Ligne2, @Ligne3, @code_postal, @ville, @zip_cedex, @etat_distr, @pays, @tel, @fax, @StringDate_maj);
 
 
 UPDATE fusionax_activites SET Raison_sociale = TRIM(Raison_sociale), Libelle_fonctio = TRIM(Libelle_fonctio);
+UPDATE  fusionax_activites
+   SET  description = IF(Raison_sociale,
+                         IF(Libelle_fonctio, CONCAT(Raison_sociale, ', ', Libelle_fonctio), Raison_sociale),
+                         Libelle_fonctio);