Update accounts schema to fit PlUser definition of email_format.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/upgrade/account/00_account.sql b/upgrade/account/00_account.sql
index 678a4dc..1a4bc9c 100644 (file)
--- a/upgrade/account/00_account.sql
+++ b/upgrade/account/00_account.sql
@@ -21,7 +21,7 @@ CREATE TABLE accounts (
   full_name varchar(255) default null,
   display_name varchar(255) default null,
   sex enum('female', 'male') not null default 'male',
-  mail_format enum('plain', 'html') not null default 'html',
+  email_format enum('text', 'html') not null default 'html',
   skin varchar(32) default null,
 
   primary key uid (uid),

diff --git a/upgrade/account/02_insertion.sql b/upgrade/account/02_insertion.sql
index fff0368..f0b7256 100644 (file)
--- a/upgrade/account/02_insertion.sql
+++ b/upgrade/account/02_insertion.sql
@@ -15,7 +15,7 @@ insert into accounts
             CONCAT(prenom, ' ', IF (nom_usage != '' and nom_usage IS NOT NULL, nom_usage, nom)) AS full_name,
             prenom AS display_name,
             IF(FIND_IN_SET('femme', flags), 'female', 'male') AS sex,
-            IF(q.core_mail_fmt = 'html', 'html', 'plain') AS mail_format,
+            IF(q.core_mail_fmt = 'html', 'html', 'text') AS email_format,
             q.skin AS skin
        from auth_user_md5 as u
   left join auth_user_quick as q on (q.user_id = u.user_id)