From e78c8b9423f134deb1a1bae86160627ccd9c3f64 Mon Sep 17 00:00:00 2001 From: JP Date: Tue, 11 Jan 2011 12:29:59 +0100 Subject: [PATCH] Oops. I had inversed alias/redirection here... --- upgrade/1.1.0/02_new_mail_insertion.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) ) -- 2.1.4