From: João Pedro Athayde Marcondes de André (JP) <jp_git@m4x.org>
Date: Sat, 30 Oct 2010 19:50:03 +0000 (+0200)
Subject: Change position of email_virtual_domains following organization from previous commit
X-Git-Tag: xorg/1.1.0~294
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=865d8774fae4917eb6e94dce6fe7fc2025646060;p=platal.git

Change position of email_virtual_domains following organization from previous commit
---

diff --git a/upgrade/1.1.0/01_new_mail.sql b/upgrade/1.1.0/01_new_mail.sql
index c363e2a..a9a0d16 100644
--- a/upgrade/1.1.0/01_new_mail.sql
+++ b/upgrade/1.1.0/01_new_mail.sql
@@ -3,6 +3,7 @@ DROP TABLE IF EXISTS email_nonaccount_emails;
 DROP TABLE IF EXISTS homonyms_list;
 DROP TABLE IF EXISTS email_redirect;
 DROP TABLE IF EXISTS email_virtual;
+DROP TABLE IF EXISTS email_virtual_domains;
 
 CREATE TABLE email_account_emails (
 	email  VARCHAR(255) NOT NULL PRIMARY KEY,
@@ -58,6 +59,10 @@ CREATE TABLE email_virtual (
 	KEY (alias)
 ) ENGINE=InnoDB,  CHARSET=utf8 ;
 
+CREATE TABLE email_virtual_domains (
+	domain VARCHAR(255) NOT NULL PRIMARY KEY
+) ENGINE=InnoDB,  CHARSET=utf8 ;
+
 
 INSERT INTO email_account_emails (uid,email,type,flags,expire)
 	SELECT a.uid,CONCAT(a.alias,'@polytechnique.org'),a.type,a.flags,a.expire
@@ -232,10 +237,6 @@ Note: There are some adresses on virtual that have no match on the virtual_redir
       in this situation are dropped.
  */
 
-CREATE TABLE email_virtual_domains (
-	domain VARCHAR(255) NOT NULL PRIMARY KEY
-) ENGINE=InnoDB,  CHARSET=utf8 ;
-
 INSERT INTO email_virtual_domains (domain)
 	VALUES ("polytechnique.org"),
 	       ("m4x.org"),