Optimize database schema; get rid of unnecessary indexes

git-svn-id: https://svn.roundcube.net/trunk@1218 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 5 insertions, 10 deletions

diff --git a/roundcubemail/SQL/sqlite.initial.sql b/roundcubemail/SQL/sqlite.initial.sql
index 4ae752983..a1eaeb8be 100644
--- a/roundcubemail/SQL/sqlite.initial.sql
+++ b/roundcubemail/SQL/sqlite.initial.sql
@@ -1,5 +1,5 @@
 -- RoundCube Webmail initial database structure
--- Version 0.1-rc1
+-- Version 0.1
 -- 
 
 -- --------------------------------------------------------
@@ -17,9 +17,7 @@ CREATE TABLE cache (
   data longtext NOT NULL
 );
 
-CREATE INDEX ix_cache_user_id ON cache(user_id);
-CREATE INDEX ix_cache_cache_key ON cache(cache_key);
-CREATE INDEX ix_cache_session_id ON cache(session_id);
+CREATE INDEX ix_cache_user_cache_key ON cache(user_id, cache_key);
 
 
 -- --------------------------------------------------------
@@ -115,14 +113,11 @@ CREATE TABLE messages (
   subject varchar(255) NOT NULL default '',
   "from" varchar(255) NOT NULL default '',
   "to" varchar(255) NOT NULL default '',
-  cc varchar(255) NOT NULL default '',
-  date datetime NOT NULL default '0000-00-00 00:00:00',
+  "cc" varchar(255) NOT NULL default '',
+  "date" datetime NOT NULL default '0000-00-00 00:00:00',
   size integer NOT NULL default '0',
   headers text NOT NULL,
   structure text
 );
 
-CREATE INDEX ix_messages_user_id ON messages(user_id);
-CREATE INDEX ix_messages_cache_key ON messages(cache_key);
-CREATE INDEX ix_messages_idx ON messages(idx);
-CREATE INDEX ix_messages_uid ON messages(uid);
+CREATE INDEX ix_messages_user_cache_uid ON messages(user_id,cache_key,uid);