improved sql parser support, fix #3947

alibaba · Oct 6, 2020 · b6a0fb5 · b6a0fb5
1 parent f5dd23f
commit b6a0fb5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/main/java/com/alibaba/druid/sql/SQLUtils.java b/src/main/java/com/alibaba/druid/sql/SQLUtils.java
@@ -585,6 +585,9 @@ public static SQLStatement parseSingleStatement(String sql, DbType dbType, boole
         return stmtList.get(0);
     }
 
+    public static SQLStatement parseSingleStatement(String sql, String dbType, SQLParserFeature... features) {
+        return parseSingleStatement(sql, DbType.of(dbType), features);
+    }
 
     public static SQLStatement parseSingleStatement(String sql, DbType dbType, SQLParserFeature... features) {
         SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType, features);

diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
@@ -4442,7 +4442,9 @@ public SQLAssignItem parseAssignItem(boolean variant) {
             } else if (dbType == DbType.db2) {
             } else if (lexer.token == Token.QUES
                     || lexer.token == Token.LITERAL_CHARS
-                    || lexer.token == Token.LITERAL_ALIAS) {
+                    || lexer.token == Token.LITERAL_ALIAS
+                    || lexer.identifierEquals("utf8mb4")
+            ) {
                 // skip
             } else {
                 accept(Token.EQ);

diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_3.java
@@ -15,6 +15,7 @@
  */
 package com.alibaba.druid.bvt.sql.mysql;
 
+import com.alibaba.druid.DbType;
 import com.alibaba.druid.sql.SQLUtils;
 import com.alibaba.druid.sql.ast.SQLStatement;
 import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
@@ -52,4 +53,9 @@ public void test_0() throws Exception {
 
         Assert.assertEquals("SET sql_mode = ?, NAMES ?, CHARACTER SET utf8, CHARACTER_SET_RESULTS = utf8, COLLATION_CONNECTION = ?", text);
     }
+
+    public void test_1() throws Exception {
+        SQLUtils.parseSingleStatement("set names utf8mb4", "mysql");
+        SQLUtils.parseSingleStatement("set names utf8mb4", (DbType) null);
+    }
 }