X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Ffusionax%2FAnciens.sql;h=7964f430af23406e896578036792c74fbd36eb80;hb=e46cf8c46341b447cc3701c8afcc9baec3da11e5;hp=c8bb51ebf347366e2be727fe2929acca30f925f8;hpb=7972436ae72911c7f2e8d5f3a26204a7ca0ee39d;p=platal.git

diff --git a/modules/fusionax/Anciens.sql b/modules/fusionax/Anciens.sql
index c8bb51e..7964f43 100644
--- a/modules/fusionax/Anciens.sql
+++ b/modules/fusionax/Anciens.sql
@@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS fusionax_anciens (
   partic_nom VARCHAR(5) character set utf8 NOT NULL COMMENT 'Particule du nom usuel',
   Nom_complet VARCHAR(255) character set utf8 NOT NULL COMMENT 'Nom patronymique complet (avec la particule)',
   Civilite ENUM('', '.', 'M', 'MME', 'MLLE') character set utf8 NOT NULL COMMENT 'Civilité',
-  Code_nationalite CHAR(3) NOT NULL COMMENT 'Nationalité (code)',
+  Code_nationalite CHAR(4) NOT NULL COMMENT 'Nationalité (code)',
   Type_membre ENUM('', '*', 'F', 'FB', 'P', 'PB', 'T', 'TB', 'TA') character set binary NOT NULL COMMENT 'Type de membre (code compris seulement par AX)',
   corps_sortie VARCHAR(50) character set utf8 NOT NULL COMMENT 'Corps de sortie (ou D si aucun)',
   Date_deces DATE COMMENT 'Date de décès',
@@ -41,6 +41,8 @@ SET
     `Date_maj` = CONCAT(SUBSTRING(@StringDate_maj,7),'-',SUBSTRING(@StringDate_maj,4,2),'-',SUBSTRING(@StringDate_maj,1,2)),
     `Date_deces` = CONCAT(SUBSTRING(@StringDate_deces,7),'-',SUBSTRING(@StringDate_deces,4,2),'-',SUBSTRING(@StringDate_deces,1,2));
 
+ALTER TABLE fusionax_anciens ADD INDEX (id_ancien);
+
 -- Correspondances entre fiches X.org et fiches AX
 DROP TABLE IF EXISTS `fusionax_import`;
 
@@ -54,11 +56,3 @@ CREATE TABLE IF NOT EXISTS `fusionax_import` (
 
 INSERT INTO `fusionax_import` ( SELECT `id_ancien`, NULL, NULL FROM `fusionax_anciens` );
 REPLACE INTO `fusionax_import` ( SELECT `matricule_ax`, `user_id`, NOW() FROM `auth_user_md5` );
-
-DROP VIEW IF EXISTS `fusionax_deceased`;
-
-CREATE VIEW  fusionax_deceased AS
-     SELECT  u.user_id, a.id_ancien, u.nom, u.prenom, u.promo, u.deces AS deces_xorg, a.Date_deces AS deces_ax
-       FROM  auth_user_md5 AS u
- INNER JOIN  fusionax_anciens AS a ON (a.id_ancien = u.matricule_ax)
-      WHERE  u.deces != a.Date_deces;