From 521192c39abb51bc704f8ec7fe60fc76ad242a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E9=93=81?= <shaojin.wensj@alibaba-inc.com>
Date: Thu, 30 Jun 2016 00:08:36 +0800
Subject: [PATCH] improved mysql parser support. bug fixed for issue #1310

---
 .../mysql/parser/MySqlCreateTableParser.java  |  2 +-
 .../bvt/sql/mysql/MySqlCreateTableTest72.java | 69 +++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest72.java

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java
index 1954ecc1fb..54c0ba47c5 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java
@@ -768,7 +768,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
             // lexer.nextToken();
             // }
 
-            if (lexer.token() == Token.IDENTIFIER) {
+            if (lexer.token() == Token.IDENTIFIER || lexer.token() == Token.LITERAL_ALIAS) {
                 SQLName indexName = this.exprParser.name();
                 if (indexName != null) {
                     key.setIndexName(indexName);
diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest72.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest72.java
new file mode 100644
index 0000000000..03fa383664
--- /dev/null
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest72.java
@@ -0,0 +1,69 @@
+/*
+ * 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;
+import com.alibaba.druid.stat.TableStat.Column;
+
+public class MySqlCreateTableTest72 extends MysqlTest {
+
+    @Test
+    public void test_one() throws Exception {
+        String sql = "CREATE TABLE \"MessageInstance\" ("
+                + "  \"id\" int(11) NOT NULL AUTO_INCREMENT,"
+                + "  \"messageId\" int(11) NOT NULL,"
+                + "  PRIMARY KEY (\"id\"),"
+                + "  KEY \"ix_messageId\" (\"messageId\")"
+                + ")";
+
+        MySqlStatementParser parser = new MySqlStatementParser(sql);
+        SQLStatement stmt = parser.parseCreateTable();
+
+        MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor();
+        stmt.accept(visitor);
+        
+        Column column = visitor.getColumn("MessageInstance", "id");
+        Assert.assertNotNull(column);
+        Assert.assertEquals("int", column.getDataType());
+
+        {
+            String output = SQLUtils.toMySqlString(stmt);
+            Assert.assertEquals("CREATE TABLE \"MessageInstance\" ("
+                    + "\n\t\"id\" int(11) NOT NULL AUTO_INCREMENT, "
+                    + "\n\t\"messageId\" int(11) NOT NULL, "
+                    + "\n\tPRIMARY KEY ('id'), "
+                    + "\n\tKEY \"ix_messageId\" ('messageId')"
+                    + "\n)", output);
+        }
+        
+        {
+            String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION);
+            Assert.assertEquals("create table \"MessageInstance\" ("
+                    + "\n\t\"id\" int(11) not null auto_increment, "
+                    + "\n\t\"messageId\" int(11) not null, "
+                    + "\n\tprimary key ('id'), "
+                    + "\n\tkey \"ix_messageId\" ('messageId')"
+                    + "\n)", output);
+        }
+    }
+}