improved sql parser support, fix #3947

This commit is contained in:
高铁
2020-10-07 00:53:07 +08:00
parent f5dd23f278
commit b6a0fb52f3
3 changed files with 12 additions and 1 deletions
@@ -585,6 +585,9 @@ public class SQLUtils {
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);
@@ -4442,7 +4442,9 @@ public class SQLExprParser extends SQLParser {
} 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);
@@ -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 class MySqlSetTest_3 extends TestCase {
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);
}
}