Added shared (cross-user) cache

1 files changed, 27 insertions, 37 deletions

diff --git a/SQL/sqlite.initial.sql b/SQL/sqlite.initial.sql
index d9bafb7e0..1b5b62b31 100644
--- a/SQL/sqlite.initial.sql
+++ b/SQL/sqlite.initial.sql
@@ -1,23 +1,6 @@
 -- Roundcube Webmail initial database structure
 
 -- 
--- Table structure for table cache
--- 
-
-CREATE TABLE cache (
-  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',
-  data text NOT NULL
-);
-
-CREATE INDEX ix_cache_user_cache_key ON cache(user_id, cache_key);
-CREATE INDEX ix_cache_created ON cache(created);
-
-
--- --------------------------------------------------------
-
--- 
 -- Table structure for table contacts and related
 -- 
 
@@ -57,9 +40,6 @@ CREATE TABLE contactgroupmembers (
 
 CREATE INDEX ix_contactgroupmembers_contact_id ON contactgroupmembers (contact_id);
 
-
--- --------------------------------------------------------
-
 -- 
 -- Table structure for table identities
 -- 
@@ -82,9 +62,6 @@ CREATE TABLE identities (
 CREATE INDEX ix_identities_user_id ON identities(user_id, del);
 CREATE INDEX ix_identities_email ON identities(email, del);
 
-
--- --------------------------------------------------------
-
 -- 
 -- Table structure for table users
 -- 
@@ -101,8 +78,6 @@ CREATE TABLE users (
 
 CREATE UNIQUE INDEX ix_users_username ON users(username, mail_host);
 
--- --------------------------------------------------------
-
 -- 
 -- Table structure for table session
 -- 
@@ -117,8 +92,6 @@ CREATE TABLE session (
 
 CREATE INDEX ix_session_changed ON session (changed);
 
--- --------------------------------------------------------
-
 --
 -- Table structure for table dictionary
 --
@@ -131,8 +104,6 @@ CREATE TABLE dictionary (
 
 CREATE UNIQUE INDEX ix_dictionary_user_language ON dictionary (user_id, "language");
 
--- --------------------------------------------------------
-
 --
 -- Table structure for table searches
 --
@@ -147,7 +118,32 @@ CREATE TABLE searches (
 
 CREATE UNIQUE INDEX ix_searches_user_type_name ON searches (user_id, type, name);
 
--- --------------------------------------------------------
+-- 
+-- Table structure for table cache
+-- 
+
+CREATE TABLE cache (
+  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',
+  data text NOT NULL
+);
+
+CREATE INDEX ix_cache_user_cache_key ON cache(user_id, cache_key);
+CREATE INDEX ix_cache_created ON cache(created);
+
+-- 
+-- Table structure for table cache_shared
+-- 
+
+CREATE TABLE cache_shared (
+  cache_key varchar(255) NOT NULL,
+  created datetime NOT NULL default '0000-00-00 00:00:00',
+  data text NOT NULL
+);
+
+CREATE INDEX ix_cache_shared_cache_key ON cache_shared(cache_key);
+CREATE INDEX ix_cache_shared_created ON cache_shared(created);
 
 --
 -- Table structure for table cache_index
@@ -164,8 +160,6 @@ CREATE TABLE cache_index (
 
 CREATE INDEX ix_cache_index_changed ON cache_index (changed);
 
--- --------------------------------------------------------
-
 --
 -- Table structure for table cache_thread
 --
@@ -180,8 +174,6 @@ CREATE TABLE cache_thread (
 
 CREATE INDEX ix_cache_thread_changed ON cache_thread (changed);
 
--- --------------------------------------------------------
-
 --
 -- Table structure for table cache_messages
 --
@@ -198,8 +190,6 @@ CREATE TABLE cache_messages (
 
 CREATE INDEX ix_cache_messages_changed ON cache_messages (changed);
 
--- --------------------------------------------------------
-
 --
 -- Table structure for table system
 --
@@ -209,4 +199,4 @@ CREATE TABLE system (
   value text NOT NULL
 );
 
-INSERT INTO system (name, value) VALUES ('roundcube-version', '2013042700');
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2013052500');