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

1 files changed, 26 insertions, 21 deletions

diff --git a/SQL/mssql.initial.sql b/SQL/mssql.initial.sql
index 23e7c7d7f..1027867e3 100644
--- a/SQL/mssql.initial.sql
+++ b/SQL/mssql.initial.sql
@@ -2,6 +2,7 @@ CREATE TABLE [dbo].[cache] (
 	[user_id] [int] NOT NULL ,

 	[cache_key] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,

 	[created] [datetime] NOT NULL ,

+	[expires] [datetime] NULL ,

 	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 

 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

 GO

@@ -9,6 +10,7 @@ GO
 CREATE TABLE [dbo].[cache_shared] (

 	[cache_key] [varchar] (255) COLLATE Latin1_General_CI_AI NOT NULL ,

 	[created] [datetime] NOT NULL ,

+	[expires] [datetime] NULL ,

 	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 

 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

 GO

@@ -16,7 +18,7 @@ GO
 CREATE TABLE [dbo].[cache_index] (

 	[user_id] [int] NOT NULL ,

 	[mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,

-	[changed] [datetime] NOT NULL ,

+	[expires] [datetime] NULL ,

 	[valid] [char] (1) COLLATE Latin1_General_CI_AI NOT NULL ,

 	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 

 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

@@ -25,7 +27,7 @@ GO
 CREATE TABLE [dbo].[cache_thread] (

 	[user_id] [int] NOT NULL ,

 	[mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,

-	[changed] [datetime] NOT NULL ,

+	[expires] [datetime] NULL ,

 	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 

 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

 GO

@@ -34,7 +36,7 @@ CREATE TABLE [dbo].[cache_messages] (
 	[user_id] [int] NOT NULL ,

 	[mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,

 	[uid] [int] NOT NULL ,

-	[changed] [datetime] NOT NULL ,

+	[expires] [datetime] NULL ,

 	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL ,

 	[flags] [int] NOT NULL

 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

@@ -211,46 +213,49 @@ ALTER TABLE [dbo].[cache] ADD
 	CONSTRAINT [DF_cache_created] DEFAULT (getdate()) FOR [created]

 GO

 

-CREATE  INDEX [IX_cache_user_id] ON [dbo].[cache]([user_id]) ON [PRIMARY]

+ALTER TABLE [dbo].[cache_shared] ADD 

+	CONSTRAINT [DF_cache_shared_created] DEFAULT (getdate()) FOR [created]

 GO

 

-CREATE  INDEX [IX_cache_cache_key] ON [dbo].[cache]([cache_key]) ON [PRIMARY]

+ALTER TABLE [dbo].[cache_index] ADD 

+	CONSTRAINT [DF_cache_index_valid] DEFAULT ('0') FOR [valid]

 GO

 

-CREATE  INDEX [IX_cache_created] ON [dbo].[cache]([created]) ON [PRIMARY]

+ALTER TABLE [dbo].[cache_messages] ADD 

+	CONSTRAINT [DF_cache_messages_flags] DEFAULT (0) FOR [flags]

 GO

 

-ALTER TABLE [dbo].[cache_shared] ADD 

-	CONSTRAINT [DF_cache_shared_created] DEFAULT (getdate()) FOR [created]

+CREATE  INDEX [IX_cache_user_id] ON [dbo].[cache]([user_id]) ON [PRIMARY]

+GO

+

+CREATE  INDEX [IX_cache_cache_key] ON [dbo].[cache]([cache_key]) ON [PRIMARY]

 GO

 

 CREATE  INDEX [IX_cache_shared_cache_key] ON [dbo].[cache_shared]([cache_key]) ON [PRIMARY]

 GO

 

-CREATE  INDEX [IX_cache_shared_created] ON [dbo].[cache_shared]([created]) ON [PRIMARY]

+CREATE  INDEX [IX_cache_index_user_id] ON [dbo].[cache_index]([user_id]) ON [PRIMARY]

 GO

 

-ALTER TABLE [dbo].[cache_index] ADD 

-	CONSTRAINT [DF_cache_index_changed] DEFAULT (getdate()) FOR [changed],

-	CONSTRAINT [DF_cache_index_valid] DEFAULT ('0') FOR [valid]

+CREATE  INDEX [IX_cache_thread_user_id] ON [dbo].[cache_thread]([user_id]) ON [PRIMARY]

 GO

 

-CREATE  INDEX [IX_cache_index_user_id] ON [dbo].[cache_index]([user_id]) ON [PRIMARY]

+CREATE  INDEX [IX_cache_messages_user_id] ON [dbo].[cache_messages]([user_id]) ON [PRIMARY]

 GO

 

-ALTER TABLE [dbo].[cache_thread] ADD 

-	CONSTRAINT [DF_cache_thread_changed] DEFAULT (getdate()) FOR [changed]

+CREATE INDEX [IX_cache_expires] ON [dbo].[cache]([expires]) ON [PRIMARY]

 GO

 

-CREATE  INDEX [IX_cache_thread_user_id] ON [dbo].[cache_thread]([user_id]) ON [PRIMARY]

+CREATE INDEX [IX_cache_shared_expires] ON [dbo].[cache_shared]([expires]) ON [PRIMARY]

 GO

 

-ALTER TABLE [dbo].[cache_messages] ADD 

-	CONSTRAINT [DF_cache_messages_changed] DEFAULT (getdate()) FOR [changed],

-	CONSTRAINT [DF_cache_messages_flags] DEFAULT (0) FOR [flags]

+CREATE INDEX [IX_cache_index_expires] ON [dbo].[cache_index]([expires]) ON [PRIMARY]

 GO

 

-CREATE  INDEX [IX_cache_messages_user_id] ON [dbo].[cache_messages]([user_id]) ON [PRIMARY]

+CREATE INDEX [IX_cache_thread_expires] ON [dbo].[cache_thread]([expires]) ON [PRIMARY]

+GO

+

+CREATE INDEX [IX_cache_messages_expires] ON [dbo].[cache_messages]([expires]) ON [PRIMARY]

 GO

 

 ALTER TABLE [dbo].[contacts] ADD 

@@ -388,6 +393,6 @@ CREATE TRIGGER [contact_delete_member] ON [dbo].[contacts]
     WHERE [contact_id] IN (SELECT [contact_id] FROM deleted)

 GO

 

-INSERT INTO [dbo].[system] ([name], [value]) VALUES ('roundcube-version', '2013052500')

+INSERT INTO [dbo].[system] ([name], [value]) VALUES ('roundcube-version', '2013061000')

 GO

 
\ No newline at end of file