From 136d99691b57ac9bb81a31d81eda71bf71378abd Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Sat, 2 Mar 2019 20:46:45 +0300
Subject: [PATCH] #5386 SQL Server: COLLATE in DDL

Former-commit-id: 65cacc0dcee9f8ee8816807cb4cc624990de96ad
---
 .../ext/mssql/edit/SQLServerTableColumnManager.java      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/org.jkiss.dbeaver.ext.mssql.ui/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerTableColumnManager.java b/plugins/org.jkiss.dbeaver.ext.mssql.ui/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerTableColumnManager.java
index a555c3d0d6..b7ed441fdb 100644
--- a/plugins/org.jkiss.dbeaver.ext.mssql.ui/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerTableColumnManager.java
+++ b/plugins/org.jkiss.dbeaver.ext.mssql.ui/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerTableColumnManager.java
@@ -60,6 +60,13 @@ public class SQLServerTableColumnManager extends SQLTableColumnManager<SQLServer
         }
     };
 
+    protected final ColumnModifier<SQLServerTableColumn> CollateModifier = (monitor, column, sql, command) -> {
+        String collationName = column.getCollationName();
+        if (!CommonUtils.isEmpty(collationName)) {
+            sql.append(" COLLATE ").append(collationName);
+        }
+    };
+
     protected final ColumnModifier<SQLServerTableColumn> SQLServerDefaultModifier = (monitor, column, sql, command) -> {
         if (!column.isPersisted()) {
             DefaultModifier.appendModifier(monitor, column, sql, command);
@@ -79,7 +86,7 @@ public class SQLServerTableColumnManager extends SQLTableColumnManager<SQLServer
 
     protected ColumnModifier[] getSupportedModifiers(SQLServerTableColumn column, Map<String, Object> options)
     {
-        return new ColumnModifier[] {DataTypeModifier, IdentityModifier, SQLServerDefaultModifier, NullNotNullModifier};
+        return new ColumnModifier[] {DataTypeModifier, IdentityModifier, CollateModifier, SQLServerDefaultModifier, NullNotNullModifier};
     }
 
     @Override
-- 
GitLab