From: JP <jp_git@m4x.org>
Date: Tue, 11 Jan 2011 11:29:59 +0000 (+0100)
Subject: Oops. I had inversed alias/redirection here...
X-Git-Tag: xorg/1.1.0~195
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=e78c8b9423f134deb1a1bae86160627ccd9c3f64;p=platal.git

Oops. I had inversed alias/redirection here...
---

diff --git a/upgrade/1.1.0/02_new_mail_insertion.sql b/upgrade/1.1.0/02_new_mail_insertion.sql
index b4f2c54..7301870 100644
--- a/upgrade/1.1.0/02_new_mail_insertion.sql
+++ b/upgrade/1.1.0/02_new_mail_insertion.sql
@@ -145,7 +145,7 @@ INSERT INTO email_virtual (email,redirect,type)
 	FROM aliases AS a
 	WHERE type='liste';
 INSERT INTO email_virtual (email,redirect,type)
-	SELECT vr.redirect,v.alias,'user'
+	SELECT v.alias,vr.redirect,'user'
 	FROM virtual AS v
 	LEFT JOIN virtual_redirect AS vr ON (v.vid=vr.vid)
 	LEFT JOIN accounts AS a ON ( a.hruid=LEFT(vr.redirect,LOCATE('@',vr.redirect)-1) )
@@ -154,7 +154,7 @@ INSERT INTO email_virtual (email,redirect,type)
 	 AND vr.vid IS NOT NULL
 	 AND a.uid IS NULL;
 INSERT INTO email_virtual (email,redirect,type)
-	SELECT vr.redirect,REPLACE(v.alias,'@melix.net','@melix.org'),'user'
+	SELECT REPLACE(v.alias,'@melix.net','@melix.org'),vr.redirect,'user'
 	FROM virtual AS v
 	LEFT JOIN virtual_redirect AS vr ON (v.vid=vr.vid)
 	LEFT JOIN accounts AS a ON ( a.hruid=LEFT(vr.redirect,LOCATE('@',vr.redirect)-1) )