improved sql parser, improved clickhouse support & mysql repository support

This commit is contained in:
高铁
2021-04-17 22:15:25 +08:00
parent 24eb08e008
commit 50d39769b1
24 changed files with 481 additions and 28 deletions
@@ -797,12 +797,21 @@ public class Lexer {
nextToken();
if (token == Token.USER || identifierEquals(FnvHash.Constants.USER)) {
return SQLType.ADD_USER;
} else if (token == TABLE) {
return SQLType.ADD_TABLE;
}
} else if (hashCode == FnvHash.Constants.REMOVE) {
nextToken();
if (token == Token.USER || identifierEquals(FnvHash.Constants.USER)) {
return SQLType.REMOVE_USER;
}
} else if (hashCode == FnvHash.Constants.TUNNEL) {
nextToken();
if (identifierEquals(FnvHash.Constants.DOWNLOAD)) {
return SQLType.TUNNEL_DOWNLOAD;
}
} else if (hashCode == FnvHash.Constants.UPLOAD) {
return SQLType.UPLOAD;
}
return SQLType.UNKNOWN;
@@ -811,7 +820,6 @@ public class Lexer {
public final SQLType scanSQLTypeV2() {
SQLType sqlType = scanSQLType();
if (sqlType == SQLType.CREATE) {
nextToken();
if (token == Token.USER || identifierEquals(FnvHash.Constants.USER)) {
@@ -869,6 +877,19 @@ public class Lexer {
} else if (token == TABLE) {
return SQLType.ALTER_TABLE;
}
} else if (sqlType == SQLType.INSERT) {
for (int i = 0; i < 1000;++i) {
nextToken();
if (token == SELECT) {
return SQLType.INSERT_SELECT;
} else if (token == VALUES) {
return SQLType.INSERT_VALUES;
} else if (token == ERROR || token == EOF) {
break;
}
}
return sqlType;
}
return sqlType;
@@ -88,7 +88,7 @@ public class SQLCreateTableParser extends SQLDDLParser {
accept(Token.TABLE);
if (lexer.token() == Token.IF) {
if (lexer.token() == Token.IF || lexer.identifierEquals("IF")) {
lexer.nextToken();
accept(Token.NOT);
accept(Token.EXISTS);
@@ -182,19 +182,15 @@ public class SQLCreateTableParser extends SQLDDLParser {
createTable.setPartitioning(partitionClause);
}
if (dbType == DbType.clickhouse) {
if (lexer.identifierEquals(FnvHash.Constants.ENGINE)) {
lexer.nextToken();
accept(Token.EQ);
createTable.setEngine(
this.exprParser.expr()
);
}
}
parseCreateTableRest(createTable);
return createTable;
}
protected void parseCreateTableRest(SQLCreateTableStatement stmt) {
}
public SQLPartitionBy parsePartitionBy() {
return null;
}
@@ -594,7 +594,11 @@ public class SQLExprParser extends SQLParser {
}
break;
case DEFAULT:
sqlExpr = new SQLDefaultExpr();
if (dbType == DbType.clickhouse) {
sqlExpr = new SQLIdentifierExpr(lexer.stringVal());
} else {
sqlExpr = new SQLDefaultExpr();
}
lexer.nextToken();
break;
case DUAL:
@@ -798,7 +802,8 @@ public class SQLExprParser extends SQLParser {
cast.setExpr(
expr());
accept(Token.AS);
cast.setDataType(parseDataType(false));
cast.setDataType(
parseDataType(false));
accept(Token.RPAREN);
sqlExpr = cast;
@@ -1758,6 +1763,9 @@ public class SQLExprParser extends SQLParser {
} else if (lexer.token == Token.VARIANT && lexer.stringVal().startsWith("$")) {
name = lexer.stringVal();
lexer.nextToken();
} else if (lexer.token == Token.LITERAL_INT && dbType == DbType.hive) {
name = lexer.numberString();
lexer.nextToken();
} else {
throw new ParserException("error : " + lexer.info());
}
@@ -3826,6 +3834,10 @@ public class SQLExprParser extends SQLParser {
charType.setHints(hints);
}
if (lexer.identifierEquals(FnvHash.Constants.ARRAY)) {
return parseDataTypeRest(charType);
}
return charType;
}
@@ -3852,6 +3864,10 @@ public class SQLExprParser extends SQLParser {
charType.setHints(hints);
}
if (lexer.identifierEquals(FnvHash.Constants.ARRAY)) {
return parseDataTypeRest(charType);
}
return charType;
}
@@ -3947,9 +3947,7 @@ public class SQLStatementParser extends SQLParser {
accept(Token.DATABASE);
}
if (lexer.token == Token.IF) {
if (lexer.token == Token.IF || lexer.identifierEquals("IF")) {
lexer.nextToken();
accept(Token.NOT);
accept(Token.EXISTS);
@@ -3,6 +3,8 @@ package com.alibaba.druid.sql.parser;
public enum SQLType {
SELECT,
UPDATE,
INSERT_SELECT,
INSERT_VALUES,
INSERT,
DELETE,
MERGE,
@@ -50,5 +52,9 @@ public enum SQLType {
ALTER_TABLE,
READ,
ADD_TABLE,
TUNNEL_DOWNLOAD,
UPLOAD,
UNKNOWN
}