From: Stéphane Jacob <sj@m4x.org>
Date: Mon, 20 Dec 2010 19:28:25 +0000 (+0100)
Subject: Ooops
X-Git-Tag: xorg/1.0.2~66
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=02526cb569d6e8b5da91ac928fd02450122cfacc;p=platal.git

Ooops

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/upgrade/1.0.1/merge.php b/upgrade/1.0.1/merge.php
index 90d320f..9df21ee 100755
--- a/upgrade/1.0.1/merge.php
+++ b/upgrade/1.0.1/merge.php
@@ -147,12 +147,13 @@ XDB::rawExecute('ALTER TABLE geoloc_countries DROP INDEX licensePlate');
 
 // Updates corps.
 XDB::rawExecute("INSERT IGNORE INTO  profile_corps_enum (name, abbreviation)
-                             VALUES  ('Ancien élève étranger', 'Z')";
+                             VALUES  ('Ancien élève étranger', 'Z')");
 XDB::rawExecute("INSERT IGNORE INTO  profile_corps_rank_enum (name, abbreviation)
                              VALUES  ('Ing.ch.P.C.hon.', 'DEL1'), ('Ing.Mil.Air Retr.', 'DEL2'),
                                      ('Col.hon.Tra.', 'DEL3'), ('Colonel CR', 'DEL4'),
-                                     ('Conseil d'Etat', 'DEL5'), ('Commiss.Gén. Brigade aérienne', 'DEL6'),
-                                     ('Off. Mar. dém.', 'DEL7'), ('Maître des Requêtes', 'DEL8')");
+                                     ('Conseil d\'Etat', 'DEL5'), ('Commiss.Gén. Brigade aérienne', 'DEL6'),
+                                     ('Off. Mar. dém.', 'DEL7'), ('Maître des Requêtes', 'DEL8'),
+                                     ('', 'DEL9'), ('autres', 'DEL10')");
 XDB::rawExecute('UPDATE  profile_corps      AS pc
              INNER JOIN  fusionax_anciens   AS f ON (f.pid = pc.pid)
              INNER JOIN  profile_corps_enum AS c ON (f.corps_sortie = c.abbreviation)
@@ -181,8 +182,7 @@ XDB::rawExecute("UPDATE  profile_corps           AS c
                     SET  c.rankid = a.id
                   WHERE  r.name LIKE 'DEL%'");
 XDB::rawExecute("DELETE FROM  profile_corps_rank_enum
-                       WHERE  name LIKE 'DEL%'")
-
+                       WHERE  name LIKE 'DEL%'");
 
 // Updates email_directory.
 XDB::rawExecute("UPDATE  profiles         AS p