improved sql server support, fix #3955

src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java

@@ -4064,6 +4064,9 @@ public class SQLStatementParser extends SQLParser {
             if (lexer.identifierEquals("CLUSTERED")) {
                 lexer.nextToken();
                 stmt.setType("UNIQUE CLUSTERED");
+            } else if (lexer.identifierEquals("NONCLUSTERED")) {
+                stmt.setType("UNIQUE NONCLUSTERED");
+                lexer.nextToken();
             } else {
                 stmt.setType("UNIQUE");
             }

src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_4.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.bvt.sql.sqlserver;
+
+import com.alibaba.druid.DbType;
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.ast.statement.SQLCreateIndexStatement;
+import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerStatementParser;
+import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerSchemaStatVisitor;
+import com.alibaba.druid.stat.TableStat;
+import com.alibaba.druid.stat.TableStat.Column;
+import com.alibaba.druid.util.JdbcConstants;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+import java.util.List;
+
+public class SQLServerCreateIndexTest_4 extends TestCase {
+
+    public void test_0() throws Exception {
+        String sql = "CREATE UNIQUE NONCLUSTERED INDEX ACT_IDX_EVENT_DEF_UNIQ " +
+                "ON FLW_EVENT_DEFINITION(KEY_, VERSION_, TENANT_ID_)";
+
+        SQLServerStatementParser parser = new SQLServerStatementParser(sql);
+        List<SQLStatement> statementList = parser.parseStatementList();
+        SQLCreateIndexStatement stmt = (SQLCreateIndexStatement) statementList.get(0);
+
+        assertEquals(1, statementList.size());
+
+        assertEquals("CREATE UNIQUE NONCLUSTERED INDEX ACT_IDX_EVENT_DEF_UNIQ ON FLW_EVENT_DEFINITION (KEY_, VERSION_, TENANT_ID_)", //
+                            SQLUtils.toSQLString(stmt, DbType.sqlserver));
+
+        SQLServerSchemaStatVisitor visitor = new SQLServerSchemaStatVisitor();
+        stmt.accept(visitor);
+
+//        System.out.println("Tables : " + visitor.getTables());
+//        System.out.println("fields : " + visitor.getColumns());
+//        System.out.println("coditions : " + visitor.getConditions());
+//        System.out.println("orderBy : " + visitor.getOrderByColumns());
+
+        assertEquals(1, visitor.getTables().size());
+        assertEquals(3, visitor.getColumns().size());
+        assertEquals(0, visitor.getConditions().size());
+
+        assertTrue(visitor.containsColumn("FLW_EVENT_DEFINITION", "KEY_"));
+        assertTrue(visitor.containsColumn("FLW_EVENT_DEFINITION", "VERSION_"));
+        assertTrue(visitor.containsColumn("FLW_EVENT_DEFINITION", "TENANT_ID_"));
+    }
+}