From fa444185a8efc1ec4c0b05f500055bcba6d3c601 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E9=93=81?= <shaojin.wensj@alibaba-inc.com>
Date: Tue, 12 Jan 2016 09:51:34 +0800
Subject: [PATCH] mysql sql parser support long byte datatype

---
 .../druid/sql/parser/SQLExprParser.java       | 11 ++++-
 .../bvt/sql/mysql/MySqlCreateTableTest59.java | 46 +++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest59.java

diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
index df65e578f9..0bdec172e0 100644
--- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
@@ -81,6 +81,7 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectItem;
 import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem;
 import com.alibaba.druid.sql.ast.statement.SQLUnique;
 import com.alibaba.druid.sql.ast.statement.SQLUpdateSetItem;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class SQLExprParser extends SQLParser {
 
@@ -1486,6 +1487,14 @@ public class SQLExprParser extends SQLParser {
 
         SQLName typeExpr = name();
         String typeName = typeExpr.toString();
+        
+        if ("long".equalsIgnoreCase(typeName) // 
+                && identifierEquals("byte") //
+                && JdbcConstants.MYSQL.equals(getDbType()) //
+                ) {
+            typeName += (' ' + lexer.stringVal());
+            lexer.nextToken();
+        }
 
         if (isCharType(typeName)) {
             SQLCharacterDataType charType = new SQLCharacterDataType(typeName);
@@ -1505,7 +1514,7 @@ public class SQLExprParser extends SQLParser {
             typeName += ' ' + lexer.stringVal();
             lexer.nextToken();
         }
-
+        
         SQLDataType dataType = new SQLDataTypeImpl(typeName);
         return parseDataTypeRest(dataType);
     }
diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest59.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest59.java
new file mode 100644
index 0000000000..9c2ad42d4f
--- /dev/null
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest59.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 1999-2101 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.mysql;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.alibaba.druid.sql.MysqlTest;
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
+import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor;
+
+public class MySqlCreateTableTest59 extends MysqlTest {
+
+    @Test
+    public void test_one() throws Exception {
+        String sql = "create table t3 (a long, b long byte);";
+
+        MySqlStatementParser parser = new MySqlStatementParser(sql);
+        SQLStatement stmt = parser.parseCreateTable();
+
+        MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor();
+        stmt.accept(visitor);
+
+        String output = SQLUtils.toMySqlString(stmt);
+        Assert.assertEquals("CREATE TABLE t3 (" //
+                            + "\n\ta long, " //
+                            + "\n\tb long byte" //
+                            + "\n)", output);
+
+    }
+}