Merge branch 'xorg/master' into xorg/f/xnet-accounts

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

diff --git a/modules/fusionax/Formations.sql b/modules/fusionax/Formations.sql
index 7d2854a..6d02a59 100644 (file)
--- a/modules/fusionax/Formations.sql
+++ b/modules/fusionax/Formations.sql
@@ -3,14 +3,33 @@
 DROP TABLE IF EXISTS `fusionax_formations`;
 
 CREATE TABLE IF NOT EXISTS `fusionax_formations` (
-  `FO` varbinary(2) NOT NULL COMMENT 'Vaut toujours FO pour cette table',
-  `id_ancien` varbinary(8) NOT NULL COMMENT 'Id unique de l''ancien',
-  `Intitule_formation` varchar(60) collate utf8_unicode_ci NOT NULL COMMENT 'Intitulé de la formation',
-  `Date_maj` DATE NOT NULL COMMENT 'Date de mise à jour de ces informations',
-  PRIMARY KEY (`id_ancien`, `Intitule_formation`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+  Date_maj DATE NOT NULL COMMENT 'Date de mise à jour de ces informations',
+  FO CHAR(2) NOT NULL COMMENT 'Vaut toujours FO pour cette table',
+  ax_id VARCHAR(8) NOT NULL COMMENT 'Id unique de l''ancien',
+  Intitule_formation VARCHAR(255) NOT NULL DEFAULT 0 COMMENT 'Intitulé de la formation',
+  Intitule_diplome VARCHAR(255) NOT NULL DEFAULT 0 COMMENT 'Intitulé du diplôme',
+  Descr_formation VARCHAR(255) NOT NULL COMMENT 'Description de la formation',
+  pid INT(11) UNSIGNED DEFAULT NULL,
+  eduid INT(4) DEFAULT NULL,
+  degreeid INT(4) DEFAULT NULL,
+  fieldid INT(2) DEFAULT NULL,
+  PRIMARY KEY (ax_id, Intitule_diplome, Intitule_formation, Descr_formation),
+  INDEX (Intitule_diplome(60)),
+  INDEX (Intitule_formation(60)),
+  INDEX (Descr_formation(60)),
+  INDEX (pid),
+  INDEX (eduid),
+  INDEX (degreeid),
+  INDEX (fieldid)
+) ENGINE=InnoDB, CHARSET=utf8;
 
-LOAD DATA LOCAL INFILE 'Formations.txt' INTO TABLE `fusionax_formations` FIELDS TERMINATED BY '\t' LINES TERMINATED BY '\r\n'
-(FO, id_ancien, Intitule_formation, @StringDate_maj)
-SET 
-`Date_maj` = CONCAT(SUBSTRING(@StringDate_maj,7),'-',SUBSTRING(@StringDate_maj,4,2),'-',SUBSTRING(@StringDate_maj,1,2));
+LOAD DATA LOCAL INFILE  '{?}Formations.txt' INTO TABLE  fusionax_formations CHARACTER SET utf8 FIELDS TERMINATED BY '\t' LINES TERMINATED BY '\n'
+(@StringDate_maj, FO, ax_id, Intitule_formation, Intitule_diplome, Descr_formation)
+SET
+Date_maj = CONCAT(SUBSTRING(@StringDate_maj,7),'-',SUBSTRING(@StringDate_maj,4,2),'-',SUBSTRING(@StringDate_maj,1,2));
+
+
+    UPDATE  fusionax_formations    AS f
+INNER JOIN  profile_education_enum AS e ON (f.Intitule_formation = e.abbreviation)
+       SET  f.Intitule_formation = e.name
+     WHERE  f.Intitule_formation != '';