- Fix MS SQL DDL (#1486020)

2 files changed, 6 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 69d63de97..174f0500a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix MS SQL DDL (#1486020)
 - Fix rcube_mdb2.php: call to setCharset not implemented in mssql driver (#1486019)
 - Added 'display_next' option
 - Fix rcube_mdb2::unixtimestamp for MS SQL (#1486015)
diff --git a/SQL/mssql.initial.sql b/SQL/mssql.initial.sql
index 534e32740..e97a9a7b7 100644
--- a/SQL/mssql.initial.sql
+++ b/SQL/mssql.initial.sql
@@ -30,7 +30,7 @@ CREATE TABLE [dbo].[identities] (
 	[email] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,

 	[reply-to] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,

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

-	[signature] [text] COLLATE Latin1_General_CI_AI NOT NULL, 

+	[signature] [text] COLLATE Latin1_General_CI_AI NULL, 

 	[html_signature] [char] (1) COLLATE Latin1_General_CI_AI NOT NULL

 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

 GO

@@ -69,9 +69,9 @@ CREATE TABLE [dbo].[users] (
 	[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 ,

+	[last_login] [datetime] NOT NULL ,

 	[language] [varchar] (5) COLLATE Latin1_General_CI_AI NULL ,

-	[preferences] [text] COLLATE Latin1_General_CI_AI NOT NULL 

+	[preferences] [text] COLLATE Latin1_General_CI_AI NULL 

 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

 GO

 

@@ -155,6 +155,7 @@ ALTER TABLE [dbo].[identities] ADD
 	CONSTRAINT [DF_identities_email] DEFAULT ('') FOR [email],

 	CONSTRAINT [DF_identities_reply] DEFAULT ('') FOR [reply-to],

 	CONSTRAINT [DF_identities_bcc] DEFAULT ('') FOR [bcc],

+	CONSTRAINT [DF_identities_html_signature] DEFAULT ('0') FOR [html_signature],

 	 CHECK ([standard] = '1' or [standard] = '0'),

 	 CHECK ([del] = '1' or [del] = '0')

 GO

@@ -202,7 +203,7 @@ 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],

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

 GO

 

  CREATE  INDEX [IX_users_username] ON [dbo].[users]([username]) ON [PRIMARY]