Changes email_virtual type from 'user' to 'alias'.

[platal.git] / upgrade / 1.1.0 / 02_new_mail_insertion.sql

diff --git a/upgrade/1.1.0/02_new_mail_insertion.sql b/upgrade/1.1.0/02_new_mail_insertion.sql
index 411b4bd..6fd0c15 100644 (file)
--- a/upgrade/1.1.0/02_new_mail_insertion.sql
+++ b/upgrade/1.1.0/02_new_mail_insertion.sql
@@ -79,11 +79,10 @@ INSERT INTO  homonyms_list (hrmid, uid)
 
 -- 5/ Feeds email_redirect_account
 INSERT INTO  email_redirect_account (uid, redirect, rewrite, type, action, broken_date, broken_level, last, flags, hash, allow_rewrite)
-     SELECT  a.uid, e.email, e.rewrite, 'smtp', ef.email, e.panne, e.panne_level, e.last,
+     SELECT  e.uid, e.email, e.rewrite, 'smtp', ef.email, e.panne, e.panne_level, e.last,
              IF(e.flags = '', 'inactive', IF(e.flags = 'disable', 'disabled', IF(e.flags = 'panne', 'broken', e.flags))), e.hash, e.allow_rewrite
        FROM  emails   AS e
   LEFT JOIN  emails   AS ef ON (e.uid = ef.uid)
-  LEFT JOIN  accounts AS a  ON (e.uid = a.uid)
       WHERE  e.flags != 'filter' AND ef.flags = 'filter';
 INSERT INTO  email_redirect_account (uid, redirect, type, action, flags)
      SELECT  a.uid, CONCAT(a.hruid, '@g.polytechnique.org'), 'googleapps', ef.email, 'active'
@@ -134,7 +133,7 @@ INSERT INTO  email_virtual (email, domain, redirect, type)
        FROM  virtual               AS v
  INNER JOIN  email_virtual_domains AS d  ON (SUBSTRING_INDEX(v.alias, '@', -1) = d.name AND d.id = d.aliasing)
   LEFT JOIN  virtual_redirect      AS vr ON (vr.vid = v.vid)
-      WHERE  v.alias NOT LIKE '%@melix.net' AND vr.vid IS NOT NULL AND v.alias != '@melix.org' AND v.type != 'dom';
+      WHERE  v.alias NOT LIKE '%@melix.net' AND vr.vid IS NOT NULL AND v.type != 'dom';
 
 INSERT INTO  email_virtual (email, type, domain, redirect)
      SELECT  alias, 'list', @p_domain_id,
@@ -146,7 +145,7 @@ INSERT INTO  email_virtual (email, type, domain, redirect)
       WHERE  type = 'liste';
 
 INSERT INTO  email_virtual (email, redirect, domain, type)
-     SELECT  SUBSTRING_INDEX(v.alias, '@', 1), vr.redirect, @m_domain_id, 'user'
+     SELECT  SUBSTRING_INDEX(v.alias, '@', 1), vr.redirect, @m_domain_id, 'alias'
        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))