From 47c0082588f5c3f05afc6a4db5cf4d5132880bce Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Tue, 3 Oct 2017 16:24:57 +0800
Subject: [PATCH] bug fixed sql server sql parser. for issue #1678

---
 .../dialect/sqlserver/ast/SQLServerTop.java   |  5 ++
 .../sqlserver/parser/SQLServerExprParser.java |  7 ++-
 .../sql/sqlserver/SQLServerSelectTest31.java  | 46 +++++++++++++++++++
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest31.java

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerTop.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerTop.java
index 91fdcab95a..bac756408c 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerTop.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerTop.java
@@ -16,6 +16,7 @@
 package com.alibaba.druid.sql.dialect.sqlserver.ast;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
 import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerASTVisitor;
 
 public class SQLServerTop extends SQLServerObjectImpl {
@@ -43,6 +44,10 @@ public class SQLServerTop extends SQLServerObjectImpl {
         this.expr = expr;
     }
 
+    public void setExpr(int expr) {
+        this.setExpr(new SQLIntegerExpr(expr));
+    }
+
     public boolean isPercent() {
         return percent;
     }
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerExprParser.java
index 5097174f06..b7dbc31459 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerExprParser.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerExprParser.java
@@ -158,7 +158,12 @@ public class SQLServerExprParser extends SQLExprParser {
                 lexer.nextToken();
             }
 
-            top.setExpr(primary());
+            if (lexer.token() == Token.LITERAL_INT) {
+                top.setExpr(lexer.integerValue().intValue());
+                lexer.nextToken();
+            } else {
+                top.setExpr(primary());
+            }
 
             if (paren) {
                 accept(Token.RPAREN);
diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest31.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest31.java
new file mode 100644
index 0000000000..d0711f1e45
--- /dev/null
+++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest31.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 1999-2017 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.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.util.JdbcConstants;
+import junit.framework.TestCase;
+
+import java.util.List;
+
+public class SQLServerSelectTest31 extends TestCase {
+
+    public void test_simple() throws Exception {
+        String sql = //
+                "select top 1 (CAST(OriganID AS VARCHAR(20)) + ',' + MobilePhoneUrl) FROM T"; //
+
+        List<SQLStatement> stmtList = SQLUtils.parseStatements(sql, JdbcConstants.SQL_SERVER);
+
+        {
+            String text = SQLUtils.toSQLString(stmtList, JdbcConstants.SQL_SERVER);
+
+            assertEquals("SELECT TOP 1 CAST(OriganID AS VARCHAR(20)) + ',' + MobilePhoneUrl\n" +
+                    "FROM T", text);
+        }
+        {
+            String text = SQLUtils.toSQLString(stmtList, JdbcConstants.SQL_SERVER, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION);
+
+            assertEquals("select top 1 cast(OriganID as VARCHAR(20)) + ',' + MobilePhoneUrl\n" +
+                    "from T", text);
+        }
+    }
+}