From: Stéphane Jacob <sj@m4x.org>
Date: Mon, 13 Dec 2010 16:07:03 +0000 (+0100)
Subject: Fixes corps insertion.
X-Git-Tag: xorg/1.0.2~74
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=fa84a89922e734aa841dc6e3c8a2042920f9e97a;p=platal.git

Fixes corps insertion.

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 5f04266..4255429 100755
--- a/upgrade/1.0.1/merge.php
+++ b/upgrade/1.0.1/merge.php
@@ -154,7 +154,7 @@ XDB::rawExecute("INSERT IGNORE INTO  profile_corps (pid, original_corpsid, curre
                              SELECT  f.pid, c.id, c.id, r.id, 'ax'
                                FROM  fusionax_anciens        AS f
                          INNER JOIN  profile_corps_enum      AS c ON (f.corps_sortie = c.abbreviation)
-                         INNER JOIN  profile_corps_rank_enum AS r ON (f.grade = r.abbreviation)
+                         INNER JOIN  profile_corps_rank_enum AS r ON (f.grade = r.name)
                               WHERE  NOT EXISTS (SELECT  *
                                                    FROM  profile_corps AS pc
                                                   WHERE  f.pid = pc.pid AND pc.original_corpsid != 1)");