diff options
author | alecpl <alec@alec.pl> | 2012-02-07 07:44:01 +0000 |
---|---|---|
committer | alecpl <alec@alec.pl> | 2012-02-07 07:44:01 +0000 |
commit | 06ca480d1e12b56b652827a89982b22770a69d50 (patch) | |
tree | 78e55c8a79909e72eb9a90197cac752ee58d0406 | |
parent | 7fb577bc8f7c0fd24c7d6119bdf87f3cee4a1418 (diff) |
- Applied fix from trunk
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | SQL/mssql.initial.sql | 8 | ||||
-rw-r--r-- | SQL/mssql.upgrade.sql | 4 |
3 files changed, 7 insertions, 6 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix parse errors in DDL files for MS SQL Server - Revert SORT=DISPLAY support, removed by mistake (#1488327) - Add lost translation label in de_DE (#1488315) - Fix drafts update issues when edited from preview pane (#1488314) diff --git a/SQL/mssql.initial.sql b/SQL/mssql.initial.sql index 406eb5412..72c24f126 100644 --- a/SQL/mssql.initial.sql +++ b/SQL/mssql.initial.sql @@ -29,8 +29,8 @@ CREATE TABLE [dbo].[cache_messages] ( [mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
[uid] [int] NOT NULL ,
[changed] [datetime] NOT NULL ,
- [data] [text] COLLATE Latin1_General_CI_AI NOT NULL
- [flags] [int](1) NOT NULL ,
+ [data] [text] COLLATE Latin1_General_CI_AI NOT NULL ,
+ [flags] [int] NOT NULL
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
GO
@@ -226,7 +226,7 @@ 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],
+ CONSTRAINT [DF_cache_messages_flags] DEFAULT (0) FOR [flags]
GO
CREATE INDEX [IX_cache_messages_user_id] ON [dbo].[cache_messages]([user_id]) ON [PRIMARY]
@@ -310,7 +310,7 @@ GO 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]
diff --git a/SQL/mssql.upgrade.sql b/SQL/mssql.upgrade.sql index f614e1955..3315365f3 100644 --- a/SQL/mssql.upgrade.sql +++ b/SQL/mssql.upgrade.sql @@ -175,8 +175,8 @@ CREATE TABLE [dbo].[cache_messages] ( [mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
[uid] [int] NOT NULL ,
[changed] [datetime] NOT NULL ,
- [data] [text] COLLATE Latin1_General_CI_AI NOT NULL
- [flags] [int] NOT NULL ,
+ [data] [text] COLLATE Latin1_General_CI_AI NOT NULL ,
+ [flags] [int] NOT NULL
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
GO
|