From 6f30a6c3ed1285876c03553cb40760d535a1e1d6 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:38:17 +0800
Subject: [PATCH] bug fixed for issue #1283

---
 .../mysql/parser/MySqlStatementParser.java    | 19 +++++++++
 .../sql/mysql/MySqlCreateDatabaseTest3.java   | 42 +++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateDatabaseTest3.java

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java
index e5bce2cc74..26cf93139d 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java
@@ -2920,16 +2920,35 @@ public class MySqlStatementParser extends SQLStatementParser {
             stmt.setHints(this.exprParser.parseHints());
         }
 
+        if (lexer.token() == Token.DEFAULT) {
+            lexer.nextToken();
+        }
+        
         if (identifierEquals("CHARACTER")) {
             lexer.nextToken();
             accept(Token.SET);
             String charset = lexer.stringVal();
             accept(Token.IDENTIFIER);
             stmt.setCharacterSet(charset);
+        } else if (identifierEquals("CHARSET")) {
+            lexer.nextToken();
+            if (lexer.token() == Token.EQ) {
+                lexer.nextToken();
+            }
+            String charset = lexer.stringVal();
+            accept(Token.IDENTIFIER);
+            stmt.setCharacterSet(charset);
+        }
+        
+        if (lexer.token() == Token.DEFAULT) {
+            lexer.nextToken();
         }
 
         if (identifierEquals("COLLATE")) {
             lexer.nextToken();
+            if (lexer.token() == Token.EQ) {
+                lexer.nextToken();
+            }
             String collate = lexer.stringVal();
             accept(Token.IDENTIFIER);
             stmt.setCollate(collate);
diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateDatabaseTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateDatabaseTest3.java
new file mode 100644
index 0000000000..2f02f1a372
--- /dev/null
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateDatabaseTest3.java
@@ -0,0 +1,42 @@
+/*
+ * 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 MySqlCreateDatabaseTest3 extends MysqlTest {
+
+    @Test
+    public void test_one() throws Exception {
+        String sql = "create database user default charset=utf8 default collate=utf8_general_ci;";
+
+        MySqlStatementParser parser = new MySqlStatementParser(sql);
+        SQLStatement stmt = parser.parseStatement();
+
+        MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor();
+        stmt.accept(visitor);
+
+        String output = SQLUtils.toMySqlString(stmt);
+        Assert.assertEquals("CREATE DATABASE user CHARACTER SET utf8 COLLATE utf8_general_ci", output);
+    }
+}