Merge commit 'debian/0.1_rc2-1' into debian

[roundcube.git] / SQL / mysql.initial.sql

diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql
index 7546e52da7645ce869106f744fe350c75d73ec69..926a83eab4a9b1c9d1b7fc831a7552e5a9fccb33 100644 (file)
--- a/SQL/mysql.initial.sql
+++ b/SQL/mysql.initial.sql
@@ -1,5 +1,5 @@
 -- RoundCube Webmail initial database structure
--- Version 0.1beta2
+-- Version 0.1-rc1
 -- 
 
 -- --------------------------------------------------------
@@ -58,6 +58,7 @@ CREATE TABLE `identities` (
   `reply-to` varchar(128) NOT NULL default '',
   `bcc` varchar(128) NOT NULL default '',
   `signature` text NOT NULL,
+  `html_signature` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`identity_id`),
   KEY `user_id` (`user_id`)
 );
@@ -72,7 +73,7 @@ CREATE TABLE `session` (
   `sess_id` varchar(40) NOT NULL default '',
   `created` datetime NOT NULL default '0000-00-00 00:00:00',
   `changed` datetime NOT NULL default '0000-00-00 00:00:00',
-  `ip` VARCHAR(15) NOT NULL default '',
+  `ip` VARCHAR(40) NOT NULL default '',
   `vars` text NOT NULL,
   PRIMARY KEY  (`sess_id`)
 );
@@ -91,7 +92,7 @@ CREATE TABLE `users` (
   `created` datetime NOT NULL default '0000-00-00 00:00:00',
   `last_login` datetime NOT NULL default '0000-00-00 00:00:00',
   `language` varchar(5) NOT NULL default 'en',
-  `preferences` text NOT NULL default '',
+  `preferences` text,
   PRIMARY KEY  (`user_id`)
 );
 
@@ -116,12 +117,12 @@ CREATE TABLE `messages` (
   `date` datetime NOT NULL default '0000-00-00 00:00:00',
   `size` int(11) unsigned NOT NULL default '0',
   `headers` text NOT NULL,
-  `body` longtext,
+  `structure` text,
   PRIMARY KEY  (`message_id`),
   KEY `user_id` (`user_id`),
-  KEY `cache_key` (`cache_key`),
   KEY `idx` (`idx`),
-  KEY `uid` (`uid`)
+  KEY `uid` (`uid`),
+  UNIQUE `uniqueness` (`user_id`, `cache_key`, `uid`)
 );