X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Ffusionax%2FFormations.sql;h=f583716154eb24a7820792ddc4b39f655f997a68;hb=e48763dcb0ddaa3189273aaec566463945720b8a;hp=c2b09f6039bbc79da4bc1cab3acbf1b717d9a344;hpb=a16cf1c2e56cc6e4c6cda1e984d2659c4cf0450c;p=platal.git

diff --git a/modules/fusionax/Formations.sql b/modules/fusionax/Formations.sql
index c2b09f6..f583716 100644
--- a/modules/fusionax/Formations.sql
+++ b/modules/fusionax/Formations.sql
@@ -4,17 +4,12 @@ DROP TABLE IF EXISTS `fusionax_formations`;
 
 CREATE TABLE IF NOT EXISTS `fusionax_formations` (
   FO CHAR(2) NOT NULL COMMENT 'Vaut toujours FO pour cette table',
-  id_ancien VARCHAR(8) NOT NULL COMMENT 'Id unique de l''ancien',
-  Intitule_diplome VARCHAR(60) collate utf8_general_ci NOT NULL COMMENT 'Intitulé du diplôme',
-  Intitule_formation VARCHAR(60) collate utf8_general_ci NOT NULL COMMENT 'Intitulé de la formation',
-  Descr_formation VARCHAR(60) collate utf8_general_ci NOT NULL COMMENT 'Description de la formation',
-  tmp_1 VARCHAR(60) collate utf8_general_ci NOT NULL,
-  tmp_2 VARCHAR(60) collate utf8_general_ci NOT NULL,
-  tmp_3 VARCHAR(60) collate utf8_general_ci NOT NULL,
-  tmp_4 VARCHAR(60) collate utf8_general_ci NOT NULL,
-  PRIMARY KEY (id_ancien, Intitule_diplome, Intitule_formation)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+  ax_id VARCHAR(8) NOT NULL COMMENT 'Id unique de l''ancien',
+  Intitule_diplome VARCHAR(60) NOT NULL COMMENT 'Intitulé du diplôme',
+  Intitule_formation VARCHAR(60) NOT NULL COMMENT 'Intitulé de la formation',
+  Descr_formation VARCHAR(60) NOT NULL COMMENT 'Description de la formation',
+  PRIMARY KEY (ax_id, Intitule_diplome, Intitule_formation)
+) 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_diplome, Intitule_formation, Descr_formation, tmp_1, tmp_2, tmp_3, tmp_4);
+LOAD DATA LOCAL INFILE  '{?}Formations.txt' INTO TABLE  fusionax_formations FIELDS TERMINATED BY '\t' LINES TERMINATED BY '\n'
+(FO, ax_id, Intitule_diplome, Intitule_formation, Descr_formation);