Fix database cache expunge issues (#1489149) - added 'expires' column

1 files changed, 11 insertions, 9 deletions

diff --git a/SQL/sqlite.initial.sql b/SQL/sqlite.initial.sql
index 1b5b62b31..28a43680d 100644
--- a/SQL/sqlite.initial.sql
+++ b/SQL/sqlite.initial.sql
@@ -126,11 +126,12 @@ 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',
+  expires datetime DEFAULT NOT,
   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);
+CREATE INDEX ix_cache_expires ON cache(expires);
 
 -- 
 -- Table structure for table cache_shared
@@ -139,11 +140,12 @@ CREATE INDEX ix_cache_created ON cache(created);
 CREATE TABLE cache_shared (
   cache_key varchar(255) NOT NULL,
   created datetime NOT NULL default '0000-00-00 00:00:00',
+  expires datetime DEFAULT NULL,
   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);
+CREATE INDEX ix_cache_shared_expires ON cache_shared(expires);
 
 --
 -- Table structure for table cache_index
@@ -152,13 +154,13 @@ CREATE INDEX ix_cache_shared_created ON cache_shared(created);
 CREATE TABLE cache_index (
     user_id integer NOT NULL,
     mailbox varchar(255) NOT NULL,
-    changed datetime NOT NULL default '0000-00-00 00:00:00',
+    expires datetime DEFAULT NULL,
     valid smallint NOT NULL DEFAULT '0',
     data text NOT NULL,
     PRIMARY KEY (user_id, mailbox)
 );
 
-CREATE INDEX ix_cache_index_changed ON cache_index (changed);
+CREATE INDEX ix_cache_index_expires ON cache_index (expires);
 
 --
 -- Table structure for table cache_thread
@@ -167,12 +169,12 @@ CREATE INDEX ix_cache_index_changed ON cache_index (changed);
 CREATE TABLE cache_thread (
     user_id integer NOT NULL,
     mailbox varchar(255) NOT NULL,
-    changed datetime NOT NULL default '0000-00-00 00:00:00',
+    expires datetime DEFAULT NULL,
     data text NOT NULL,
     PRIMARY KEY (user_id, mailbox)
 );
 
-CREATE INDEX ix_cache_thread_changed ON cache_thread (changed);
+CREATE INDEX ix_cache_thread_expires ON cache_thread (expires);
 
 --
 -- Table structure for table cache_messages
@@ -182,13 +184,13 @@ CREATE TABLE cache_messages (
     user_id integer NOT NULL,
     mailbox varchar(255) NOT NULL,
     uid integer NOT NULL,
-    changed datetime NOT NULL default '0000-00-00 00:00:00',
+    expires datetime DEFAULT NULL,
     data text NOT NULL,
     flags integer NOT NULL DEFAULT '0',
     PRIMARY KEY (user_id, mailbox, uid)
 );
 
-CREATE INDEX ix_cache_messages_changed ON cache_messages (changed);
+CREATE INDEX ix_cache_messages_expires ON cache_messages (expires);
 
 --
 -- Table structure for table system
@@ -199,4 +201,4 @@ CREATE TABLE system (
   value text NOT NULL
 );
 
-INSERT INTO system (name, value) VALUES ('roundcube-version', '2013052500');
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2013061000');