From 4b7093dc6a43d107c6032a5f4ae958802d277eda Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Tue, 15 Aug 2017 09:08:34 +0800
Subject: [PATCH] bug fixed for mysql parser. issue #1905

---
 .../dialect/mysql/parser/MySqlExprParser.java | 15 ++---
 .../MySqlCreateTableTest79_collate.java       | 58 +++++++++++++++++++
 2 files changed, 62 insertions(+), 11 deletions(-)
 create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest79_collate.java

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java
index d4c493f4f6..008ee56a47 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java
@@ -249,7 +249,8 @@ public class MySqlExprParser extends SQLExprParser {
                     lexer.nextToken();
                 }
 
-                if (lexer.token() != Token.IDENTIFIER) {
+                if (lexer.token() != Token.IDENTIFIER
+                        && lexer.token() != Token.LITERAL_CHARS) {
                     throw new ParserException("syntax error. " + lexer.info());
                 }
 
@@ -266,7 +267,8 @@ public class MySqlExprParser extends SQLExprParser {
                 if ("COLLATE".equalsIgnoreCase(lexer.stringVal())) {
                     lexer.nextToken();
 
-                    if (lexer.token() != Token.IDENTIFIER) {
+                    if (lexer.token() != Token.IDENTIFIER
+                            && lexer.token() != Token.LITERAL_CHARS) {
                         throw new ParserException("syntax error. " + lexer.info());
                     }
 
@@ -277,15 +279,6 @@ public class MySqlExprParser extends SQLExprParser {
 
                     return primaryRest(expr);
                 }
-//            } else if (expr instanceof SQLIntegerExpr) {
-//                SQLIntegerExpr intExpr = (SQLIntegerExpr) expr;
-//                String binaryString = lexer.stringVal();
-//                if (intExpr.getNumber().intValue() == 0 && binaryString.startsWith("b")) {
-//                    lexer.nextToken();
-//                    expr = new SQLBinaryExpr(binaryString.substring(1));
-//
-//                    return primaryRest(expr);
-//                }
             }
         }
 
diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest79_collate.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest79_collate.java
new file mode 100644
index 0000000000..264356cc17
--- /dev/null
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest79_collate.java
@@ -0,0 +1,58 @@
+/*
+ * 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.mysql.createTable;
+
+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;
+import com.alibaba.druid.stat.TableStat.Column;
+
+public class MySqlCreateTableTest79_collate extends MysqlTest {
+
+    public void test_one() throws Exception {
+        String sql = "CREATE TABLE tb_custom_vip_show_message (custom_vip_show_message_seq INT(11) NOT NULL AUTO_INCREMENT,show_channel_type TINYINT(4) NOT NULL COMMENT '通道类型',PRIMARY KEY (custom_vip_show_message_seq))COMMENT='自定VIP显示表' COLLATE='utf8_general_ci' ENGINE=InnoDB;";
+
+        MySqlStatementParser parser = new MySqlStatementParser(sql);
+        SQLStatement stmt = parser.parseCreateTable();
+
+        MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor();
+        stmt.accept(visitor);
+        
+        Column column = visitor.getColumn("tb_custom_vip_show_message", "custom_vip_show_message_seq");
+        assertNotNull(column);
+        assertEquals("INT", column.getDataType());
+
+        {
+            String output = SQLUtils.toMySqlString(stmt);
+            assertEquals("CREATE TABLE tb_custom_vip_show_message (\n" +
+                    "\tcustom_vip_show_message_seq INT(11) NOT NULL AUTO_INCREMENT,\n" +
+                    "\tshow_channel_type TINYINT(4) NOT NULL COMMENT '通道类型',\n" +
+                    "\tPRIMARY KEY (custom_vip_show_message_seq)\n" +
+                    ") COMMENT = '自定VIP显示表' COLLATE utf8_general_ci ENGINE = InnoDB", output);
+        }
+        
+        {
+            String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION);
+            assertEquals("create table tb_custom_vip_show_message (\n" +
+                    "\tcustom_vip_show_message_seq INT(11) not null auto_increment,\n" +
+                    "\tshow_channel_type TINYINT(4) not null comment '通道类型',\n" +
+                    "\tprimary key (custom_vip_show_message_seq)\n" +
+                    ") comment = '自定VIP显示表' collate utf8_general_ci engine = InnoDB", output);
+        }
+    }
+}