Merge commit 'upstream/0.3' into unstable-import

[roundcube.git] / SQL / mssql.initial.sql

diff --git a/SQL/mssql.initial.sql b/SQL/mssql.initial.sql
index f3b5d5ca7474ad71bc8fae92619ccc9e1ad2b9eb..e97a9a7b740a72c07138e4647feae01f7d346432 100644 (file)
--- a/SQL/mssql.initial.sql
+++ b/SQL/mssql.initial.sql
@@ -1,7 +1,6 @@
 CREATE TABLE [dbo].[cache] (\r
        [cache_id] [int] IDENTITY (1, 1) NOT NULL ,\r
        [user_id] [int] NOT NULL ,\r
-       [session_id] [varchar] (32) COLLATE Latin1_General_CI_AI NULL ,\r
        [cache_key] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,\r
        [created] [datetime] NOT NULL ,\r
        [data] [text] COLLATE Latin1_General_CI_AI NOT NULL \r
@@ -31,7 +30,8 @@ CREATE TABLE [dbo].[identities] (
        [email] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,\r
        [reply-to] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,\r
        [bcc] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,\r
-       [signature] [text] COLLATE Latin1_General_CI_AI NOT NULL \r
+       [signature] [text] COLLATE Latin1_General_CI_AI NULL, \r
+       [html_signature] [char] (1) COLLATE Latin1_General_CI_AI NOT NULL\r
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]\r
 GO\r
 \r
@@ -69,9 +69,9 @@ CREATE TABLE [dbo].[users] (
        [mail_host] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,\r
        [alias] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,\r
        [created] [datetime] NOT NULL ,\r
-       [last_login] [datetime] NULL ,\r
-       [language] [varchar] (5) COLLATE Latin1_General_CI_AI NOT NULL ,\r
-       [preferences] [text] COLLATE Latin1_General_CI_AI NOT NULL \r
+       [last_login] [datetime] NOT NULL ,\r
+       [language] [varchar] (5) COLLATE Latin1_General_CI_AI NULL ,\r
+       [preferences] [text] COLLATE Latin1_General_CI_AI NULL \r
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]\r
 GO\r
 \r
@@ -119,7 +119,6 @@ GO
 \r
 ALTER TABLE [dbo].[cache] ADD \r
        CONSTRAINT [DF_cache_user_id] DEFAULT ('0') FOR [user_id],\r
-       CONSTRAINT [DF_cache_session_id] DEFAULT (null) FOR [session_id],\r
        CONSTRAINT [DF_cache_cache_key] DEFAULT ('') FOR [cache_key],\r
        CONSTRAINT [DF_cache_created] DEFAULT (getdate()) FOR [created]\r
 GO\r
@@ -130,7 +129,7 @@ GO
  CREATE  INDEX [IX_cache_cache_key] ON [dbo].[cache]([cache_key]) ON [PRIMARY]\r
 GO\r
 \r
- CREATE  INDEX [IX_cache_session_id] ON [dbo].[cache]([session_id]) ON [PRIMARY]\r
+ CREATE  INDEX [IX_cache_created] ON [dbo].[cache]([created]) ON [PRIMARY]\r
 GO\r
 \r
 ALTER TABLE [dbo].[contacts] ADD \r
@@ -156,6 +155,7 @@ ALTER TABLE [dbo].[identities] ADD
        CONSTRAINT [DF_identities_email] DEFAULT ('') FOR [email],\r
        CONSTRAINT [DF_identities_reply] DEFAULT ('') FOR [reply-to],\r
        CONSTRAINT [DF_identities_bcc] DEFAULT ('') FOR [bcc],\r
+       CONSTRAINT [DF_identities_html_signature] DEFAULT ('0') FOR [html_signature],\r
         CHECK ([standard] = '1' or [standard] = '0'),\r
         CHECK ([del] = '1' or [del] = '0')\r
 GO\r
@@ -184,10 +184,10 @@ GO
  CREATE  INDEX [IX_messages_cache_key] ON [dbo].[messages]([cache_key]) ON [PRIMARY]\r
 GO\r
 \r
- CREATE  INDEX [IX_messages_idx] ON [dbo].[messages]([idx]) ON [PRIMARY]\r
+ CREATE  INDEX [IX_messages_uid] ON [dbo].[messages]([uid]) ON [PRIMARY]\r
 GO\r
 \r
- CREATE  INDEX [IX_messages_uid] ON [dbo].[messages]([uid]) ON [PRIMARY]\r
+ CREATE  INDEX [IX_messages_created] ON [dbo].[messages]([created]) ON [PRIMARY]\r
 GO\r
 \r
 ALTER TABLE [dbo].[session] ADD \r
@@ -196,11 +196,19 @@ ALTER TABLE [dbo].[session] ADD
        CONSTRAINT [DF_session_ip] DEFAULT ('') FOR [ip]\r
 GO\r
 \r
+ CREATE  INDEX [IX_session_changed] ON [dbo].[session]([changed]) ON [PRIMARY]\r
+GO\r
+\r
 ALTER TABLE [dbo].[users] ADD \r
        CONSTRAINT [DF_users_username] DEFAULT ('') FOR [username],\r
        CONSTRAINT [DF_users_mail_host] DEFAULT ('') FOR [mail_host],\r
        CONSTRAINT [DF_users_alias] DEFAULT ('') FOR [alias],\r
-       CONSTRAINT [DF_users_created] DEFAULT (getdate()) FOR [created],\r
-       CONSTRAINT [DF_users_language] DEFAULT ('en') FOR [language]\r
+       CONSTRAINT [DF_users_created] DEFAULT (getdate()) FOR [created]\r
+GO\r
+\r
+ CREATE  INDEX [IX_users_username] ON [dbo].[users]([username]) ON [PRIMARY]\r
+GO\r
+\r
+ CREATE  INDEX [IX_users_alias] ON [dbo].[users]([alias]) ON [PRIMARY]\r
 GO\r
 \r