From fa84a89922e734aa841dc6e3c8a2042920f9e97a Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Mon, 13 Dec 2010 17:07:03 +0100 Subject: [PATCH] Fixes corps insertion. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- upgrade/1.0.1/merge.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)"); -- 2.1.4