From ac382e114570537e038eca79d2c8b90a4b95af12 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli <thomas@roundcube.net> Date: Mon, 19 Nov 2012 05:08:11 -0500 Subject: [PATCH] Always save drafts with format=flowed in order to keep original paragraphs and line wraps (#1488799) --- SQL/sqlite.initial.sql | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/SQL/sqlite.initial.sql b/SQL/sqlite.initial.sql index 7ec8201..f5b5615 100644 --- a/SQL/sqlite.initial.sql +++ b/SQL/sqlite.initial.sql @@ -5,7 +5,6 @@ -- CREATE TABLE cache ( - cache_id integer NOT NULL PRIMARY KEY, user_id integer NOT NULL default 0, cache_key varchar(128) NOT NULL default '', created datetime NOT NULL default '0000-00-00 00:00:00', @@ -24,18 +23,18 @@ CREATE TABLE contacts ( contact_id integer NOT NULL PRIMARY KEY, - user_id integer NOT NULL default '0', + user_id integer NOT NULL, changed datetime NOT NULL default '0000-00-00 00:00:00', del tinyint NOT NULL default '0', name varchar(128) NOT NULL default '', - email varchar(255) NOT NULL default '', + email text NOT NULL default '', firstname varchar(128) NOT NULL default '', surname varchar(128) NOT NULL default '', vcard text NOT NULL default '', words text NOT NULL default '' ); -CREATE INDEX ix_contacts_user_id ON contacts(user_id, email); +CREATE INDEX ix_contacts_user_id ON contacts(user_id, del); CREATE TABLE contactgroups ( @@ -81,6 +80,7 @@ ); CREATE INDEX ix_identities_user_id ON identities(user_id, del); +CREATE INDEX ix_identities_email ON identities(email, del); -- -------------------------------------------------------- @@ -93,7 +93,6 @@ user_id integer NOT NULL PRIMARY KEY, username varchar(128) NOT NULL default '', mail_host varchar(128) NOT NULL default '', - alias varchar(128) NOT NULL default '', created datetime NOT NULL default '0000-00-00 00:00:00', last_login datetime DEFAULT NULL, language varchar(5), @@ -101,7 +100,6 @@ ); CREATE UNIQUE INDEX ix_users_username ON users(username, mail_host); -CREATE INDEX ix_users_alias ON users(alias); -- -------------------------------------------------------- @@ -110,7 +108,7 @@ -- CREATE TABLE session ( - sess_id varchar(40) NOT NULL PRIMARY KEY, + sess_id varchar(128) NOT NULL PRIMARY KEY, created datetime NOT NULL default '0000-00-00 00:00:00', changed datetime NOT NULL default '0000-00-00 00:00:00', ip varchar(40) NOT NULL default '', @@ -147,7 +145,7 @@ data text NOT NULL ); -CREATE UNIQUE INDEX ix_searches_user_type_name (user_id, type, name); +CREATE UNIQUE INDEX ix_searches_user_type_name ON searches (user_id, type, name); -- -------------------------------------------------------- @@ -159,6 +157,7 @@ user_id integer NOT NULL, mailbox varchar(255) NOT NULL, changed datetime NOT NULL default '0000-00-00 00:00:00', + valid smallint NOT NULL DEFAULT '0', data text NOT NULL, PRIMARY KEY (user_id, mailbox) ); @@ -193,12 +192,7 @@ uid integer NOT NULL, changed datetime NOT NULL default '0000-00-00 00:00:00', data text NOT NULL, - seen smallint NOT NULL DEFAULT '0', - deleted smallint NOT NULL DEFAULT '0', - answered smallint NOT NULL DEFAULT '0', - forwarded smallint NOT NULL DEFAULT '0', - flagged smallint NOT NULL DEFAULT '0', - mdnsent smallint NOT NULL DEFAULT '0', + flags integer NOT NULL DEFAULT '0', PRIMARY KEY (user_id, mailbox, uid) ); -- Gitblit v1.9.1