From 4e4c2511bc00cfc0214acab63b097efe142187a7 Mon Sep 17 00:00:00 2001 From: Thomas B. <thomas@roundcube.net> Date: Thu, 24 Oct 2013 16:52:39 -0400 Subject: [PATCH] Merge pull request #143 from cmcnulty/#1489392---fix-control+arrow-behavior --- SQL/mssql.initial.sql | 189 ++++++++++++++++++++++++++++++---------------- 1 files changed, 122 insertions(+), 67 deletions(-) diff --git a/SQL/mssql.initial.sql b/SQL/mssql.initial.sql index 8e103eb..1027867 100644 --- a/SQL/mssql.initial.sql +++ b/SQL/mssql.initial.sql @@ -1,9 +1,44 @@ CREATE TABLE [dbo].[cache] ( - [cache_id] [int] IDENTITY (1, 1) NOT NULL , [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 + +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 + +CREATE TABLE [dbo].[cache_index] ( + [user_id] [int] NOT NULL , + [mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI 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] +GO + +CREATE TABLE [dbo].[cache_thread] ( + [user_id] [int] NOT NULL , + [mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL , + [expires] [datetime] NULL , + [data] [text] COLLATE Latin1_General_CI_AI NOT NULL +) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +GO + +CREATE TABLE [dbo].[cache_messages] ( + [user_id] [int] NOT NULL , + [mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL , + [uid] [int] NOT NULL , + [expires] [datetime] NULL , + [data] [text] COLLATE Latin1_General_CI_AI NOT NULL , + [flags] [int] NOT NULL ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] GO @@ -13,7 +48,7 @@ [changed] [datetime] NOT NULL , [del] [char] (1) COLLATE Latin1_General_CI_AI NOT NULL , [name] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL , - [email] [varchar] (255) COLLATE Latin1_General_CI_AI NOT NULL , + [email] [varchar] (8000) COLLATE Latin1_General_CI_AI NOT NULL , [firstname] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL , [surname] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL , [vcard] [text] COLLATE Latin1_General_CI_AI NULL , @@ -53,27 +88,8 @@ ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] GO -CREATE TABLE [dbo].[messages] ( - [message_id] [int] IDENTITY (1, 1) NOT NULL , - [user_id] [int] NOT NULL , - [del] [tinyint] NOT NULL , - [cache_key] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL , - [created] [datetime] NOT NULL , - [idx] [int] NOT NULL , - [uid] [int] NOT NULL , - [subject] [varchar] (255) COLLATE Latin1_General_CI_AI NOT NULL , - [from] [varchar] (255) COLLATE Latin1_General_CI_AI NOT NULL , - [to] [varchar] (255) COLLATE Latin1_General_CI_AI NOT NULL , - [cc] [varchar] (255) COLLATE Latin1_General_CI_AI NOT NULL , - [date] [datetime] NOT NULL , - [size] [int] NOT NULL , - [headers] [text] COLLATE Latin1_General_CI_AI NOT NULL , - [structure] [text] COLLATE Latin1_General_CI_AI NULL -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO - CREATE TABLE [dbo].[session] ( - [sess_id] [varchar] (32) COLLATE Latin1_General_CI_AI NOT NULL , + [sess_id] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL , [created] [datetime] NOT NULL , [changed] [datetime] NULL , [ip] [varchar] (40) COLLATE Latin1_General_CI_AI NOT NULL , @@ -85,7 +101,6 @@ [user_id] [int] IDENTITY (1, 1) NOT NULL , [username] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL , [mail_host] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL , - [alias] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL , [created] [datetime] NOT NULL , [last_login] [datetime] NULL , [language] [varchar] (5) COLLATE Latin1_General_CI_AI NULL , @@ -109,11 +124,31 @@ ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] GO -ALTER TABLE [dbo].[cache] WITH NOCHECK ADD - PRIMARY KEY CLUSTERED +CREATE TABLE [dbo].[system] ( + [name] [varchar] (64) COLLATE Latin1_General_CI_AI NOT NULL , + [value] [text] COLLATE Latin1_General_CI_AI NOT NULL +) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +GO + +ALTER TABLE [dbo].[cache_index] WITH NOCHECK ADD + PRIMARY KEY CLUSTERED ( - [cache_id] - ) ON [PRIMARY] + [user_id],[mailbox] + ) ON [PRIMARY] +GO + +ALTER TABLE [dbo].[cache_thread] WITH NOCHECK ADD + PRIMARY KEY CLUSTERED + ( + [user_id],[mailbox] + ) ON [PRIMARY] +GO + +ALTER TABLE [dbo].[cache_messages] WITH NOCHECK ADD + PRIMARY KEY CLUSTERED + ( + [user_id],[mailbox],[uid] + ) ON [PRIMARY] GO ALTER TABLE [dbo].[contacts] WITH NOCHECK ADD @@ -144,13 +179,6 @@ ) ON [PRIMARY] GO -ALTER TABLE [dbo].[messages] WITH NOCHECK ADD - PRIMARY KEY CLUSTERED - ( - [message_id] - ) ON [PRIMARY] -GO - ALTER TABLE [dbo].[session] WITH NOCHECK ADD CONSTRAINT [PK_session_sess_id] PRIMARY KEY CLUSTERED ( @@ -172,10 +200,29 @@ ) ON [PRIMARY] GO +ALTER TABLE [dbo].[system] WITH NOCHECK ADD + CONSTRAINT [PK_system_name] PRIMARY KEY CLUSTERED + ( + [name] + ) ON [PRIMARY] +GO + ALTER TABLE [dbo].[cache] ADD CONSTRAINT [DF_cache_user_id] DEFAULT ('0') FOR [user_id], CONSTRAINT [DF_cache_cache_key] DEFAULT ('') FOR [cache_key], CONSTRAINT [DF_cache_created] DEFAULT (getdate()) FOR [created] +GO + +ALTER TABLE [dbo].[cache_shared] ADD + CONSTRAINT [DF_cache_shared_created] DEFAULT (getdate()) FOR [created] +GO + +ALTER TABLE [dbo].[cache_index] ADD + CONSTRAINT [DF_cache_index_valid] DEFAULT ('0') FOR [valid] +GO + +ALTER TABLE [dbo].[cache_messages] ADD + CONSTRAINT [DF_cache_messages_flags] DEFAULT (0) FOR [flags] GO CREATE INDEX [IX_cache_user_id] ON [dbo].[cache]([user_id]) ON [PRIMARY] @@ -184,7 +231,31 @@ CREATE INDEX [IX_cache_cache_key] ON [dbo].[cache]([cache_key]) ON [PRIMARY] GO -CREATE INDEX [IX_cache_created] ON [dbo].[cache]([created]) ON [PRIMARY] +CREATE INDEX [IX_cache_shared_cache_key] ON [dbo].[cache_shared]([cache_key]) ON [PRIMARY] +GO + +CREATE INDEX [IX_cache_index_user_id] ON [dbo].[cache_index]([user_id]) ON [PRIMARY] +GO + +CREATE INDEX [IX_cache_thread_user_id] ON [dbo].[cache_thread]([user_id]) ON [PRIMARY] +GO + +CREATE INDEX [IX_cache_messages_user_id] ON [dbo].[cache_messages]([user_id]) ON [PRIMARY] +GO + +CREATE INDEX [IX_cache_expires] ON [dbo].[cache]([expires]) ON [PRIMARY] +GO + +CREATE INDEX [IX_cache_shared_expires] ON [dbo].[cache_shared]([expires]) ON [PRIMARY] +GO + +CREATE INDEX [IX_cache_index_expires] ON [dbo].[cache_index]([expires]) ON [PRIMARY] +GO + +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 @@ -237,32 +308,7 @@ CREATE INDEX [IX_identities_user_id] ON [dbo].[identities]([user_id]) ON [PRIMARY] GO - -ALTER TABLE [dbo].[messages] ADD - CONSTRAINT [DF_messages_user_id] DEFAULT (0) FOR [user_id], - CONSTRAINT [DF_messages_del] DEFAULT (0) FOR [del], - CONSTRAINT [DF_messages_cache_key] DEFAULT ('') FOR [cache_key], - CONSTRAINT [DF_messages_created] DEFAULT (getdate()) FOR [created], - CONSTRAINT [DF_messages_idx] DEFAULT (0) FOR [idx], - CONSTRAINT [DF_messages_uid] DEFAULT (0) FOR [uid], - CONSTRAINT [DF_messages_subject] DEFAULT ('') FOR [subject], - CONSTRAINT [DF_messages_from] DEFAULT ('') FOR [from], - CONSTRAINT [DF_messages_to] DEFAULT ('') FOR [to], - CONSTRAINT [DF_messages_cc] DEFAULT ('') FOR [cc], - CONSTRAINT [DF_messages_date] DEFAULT (getdate()) FOR [date], - CONSTRAINT [DF_messages_size] DEFAULT (0) FOR [size] -GO - -CREATE INDEX [IX_messages_user_id] ON [dbo].[messages]([user_id]) ON [PRIMARY] -GO - -CREATE INDEX [IX_messages_cache_key] ON [dbo].[messages]([cache_key]) ON [PRIMARY] -GO - -CREATE INDEX [IX_messages_uid] ON [dbo].[messages]([uid]) ON [PRIMARY] -GO - -CREATE INDEX [IX_messages_created] ON [dbo].[messages]([created]) ON [PRIMARY] +CREATE INDEX [IX_identities_email] ON [dbo].[identities]([email],[del]) ON [PRIMARY] GO ALTER TABLE [dbo].[session] ADD @@ -277,14 +323,10 @@ ALTER TABLE [dbo].[users] ADD CONSTRAINT [DF_users_username] DEFAULT ('') FOR [username], CONSTRAINT [DF_users_mail_host] DEFAULT ('') FOR [mail_host], - CONSTRAINT [DF_users_alias] DEFAULT ('') FOR [alias], CONSTRAINT [DF_users_created] DEFAULT (getdate()) FOR [created] GO CREATE UNIQUE INDEX [IX_users_username] ON [dbo].[users]([username],[mail_host]) ON [PRIMARY] -GO - -CREATE INDEX [IX_users_alias] ON [dbo].[users]([alias]) ON [PRIMARY] GO CREATE UNIQUE INDEX [IX_dictionary_user_language] ON [dbo].[dictionary]([user_id],[language]) ON [PRIMARY] @@ -292,7 +334,7 @@ ALTER TABLE [dbo].[searches] ADD CONSTRAINT [DF_searches_user] DEFAULT (0) FOR [user_id], - CONSTRAINT [DF_searches_type] DEFAULT (0) FOR [type], + CONSTRAINT [DF_searches_type] DEFAULT (0) FOR [type] GO CREATE UNIQUE INDEX [IX_searches_user_type_name] ON [dbo].[searches]([user_id],[type],[name]) ON [PRIMARY] @@ -318,7 +360,17 @@ ON DELETE CASCADE ON UPDATE CASCADE GO -ALTER TABLE [dbo].[messages] ADD CONSTRAINT [FK_messages_user_id] +ALTER TABLE [dbo].[cache_index] ADD CONSTRAINT [FK_cache_index_user_id] + FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id]) + ON DELETE CASCADE ON UPDATE CASCADE +GO + +ALTER TABLE [dbo].[cache_thread] ADD CONSTRAINT [FK_cache_thread_user_id] + FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id]) + ON DELETE CASCADE ON UPDATE CASCADE +GO + +ALTER TABLE [dbo].[cache_messages] ADD CONSTRAINT [FK_cache_messages_user_id] FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id]) ON DELETE CASCADE ON UPDATE CASCADE GO @@ -341,3 +393,6 @@ WHERE [contact_id] IN (SELECT [contact_id] FROM deleted) GO +INSERT INTO [dbo].[system] ([name], [value]) VALUES ('roundcube-version', '2013061000') +GO + \ No newline at end of file -- Gitblit v1.9.1