mirror of
https://github.com/alibaba/druid.git
synced 2023-03-04 19:17:16 +00:00
Revert "bug: 修复多处oracle与mysql解析sql 语法不正确"
This commit is contained in:
@@ -531,11 +531,6 @@ public class SQLExprParser extends SQLParser {
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else if (DbType.oracle == dbType) {
|
||||
lexer.nextTokenValue();
|
||||
if (lexer.token == Token.BARBAR) {
|
||||
sqlExpr = additiveRest(sqlExpr);
|
||||
}
|
||||
} else {
|
||||
lexer.nextToken();
|
||||
}
|
||||
@@ -1312,7 +1307,7 @@ public class SQLExprParser extends SQLParser {
|
||||
expr = dotRest(expr);
|
||||
return primaryRest(expr);
|
||||
} else if (lexer.identifierEquals(FnvHash.Constants.SETS) //
|
||||
&& expr.getClass() == SQLIdentifierExpr.class //
|
||||
&& expr.getClass() == SQLIdentifierExpr.class //
|
||||
&& "GROUPING".equalsIgnoreCase(((SQLIdentifierExpr) expr).getName())) {
|
||||
SQLGroupingSetExpr groupingSets = new SQLGroupingSetExpr();
|
||||
lexer.nextToken();
|
||||
|
||||
@@ -582,12 +582,7 @@ public class SQLStatementParser extends SQLParser {
|
||||
stmt.setParent(parent);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (lexer.token() == Token.ELSEIF
|
||||
&& parent instanceof SQLIfStatement) {
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
int size = statementList.size();
|
||||
if (parseStatementListDialect(statementList)) {
|
||||
if (parent != null) {
|
||||
@@ -595,9 +590,6 @@ public class SQLStatementParser extends SQLParser {
|
||||
SQLStatement dialectStmt = statementList.get(j);
|
||||
dialectStmt.setParent(parent);
|
||||
}
|
||||
if (parent instanceof SQLCreateTriggerStatement) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
continue;
|
||||
@@ -3851,7 +3843,7 @@ public class SQLStatementParser extends SQLParser {
|
||||
stmt.setWhen(condition);
|
||||
}
|
||||
|
||||
List<SQLStatement> body = this.parseStatementList(stmt);
|
||||
List<SQLStatement> body = this.parseStatementList();
|
||||
if (body == null || body.isEmpty()) {
|
||||
throw new ParserException("syntax error");
|
||||
}
|
||||
|
||||
@@ -16,56 +16,56 @@
|
||||
package com.alibaba.druid.sql.parser;
|
||||
|
||||
/**
|
||||
*
|
||||
* SQL Token
|
||||
*
|
||||
* SQL Token
|
||||
* @author wenshao [szujobs@hotmail.com]
|
||||
*/
|
||||
public enum Token {
|
||||
SELECT("SELECT"),
|
||||
DELETE("DELETE"),
|
||||
INSERT("INSERT"),
|
||||
UPDATE("UPDATE"),
|
||||
SELECT("SELECT"),
|
||||
DELETE("DELETE"),
|
||||
INSERT("INSERT"),
|
||||
UPDATE("UPDATE"),
|
||||
|
||||
FROM("FROM"),
|
||||
HAVING("HAVING"),
|
||||
WHERE("WHERE"),
|
||||
ORDER("ORDER"),
|
||||
FROM("FROM"),
|
||||
HAVING("HAVING"),
|
||||
WHERE("WHERE"),
|
||||
ORDER("ORDER"),
|
||||
BY("BY"),
|
||||
GROUP("GROUP"),
|
||||
INTO("INTO"),
|
||||
AS("AS"),
|
||||
GROUP("GROUP"),
|
||||
INTO("INTO"),
|
||||
AS("AS"),
|
||||
|
||||
CREATE("CREATE"),
|
||||
ALTER("ALTER"),
|
||||
DROP("DROP"),
|
||||
SET("SET"),
|
||||
ALTER("ALTER"),
|
||||
DROP("DROP"),
|
||||
SET("SET"),
|
||||
|
||||
NULL("NULL"),
|
||||
NOT("NOT"),
|
||||
NULL("NULL"),
|
||||
NOT("NOT"),
|
||||
DISTINCT("DISTINCT"),
|
||||
|
||||
TABLE("TABLE"),
|
||||
TABLESPACE("TABLESPACE"),
|
||||
VIEW("VIEW"),
|
||||
SEQUENCE("SEQUENCE"),
|
||||
TRIGGER("TRIGGER"),
|
||||
USER("USER"),
|
||||
INDEX("INDEX"),
|
||||
TABLE("TABLE"),
|
||||
TABLESPACE("TABLESPACE"),
|
||||
VIEW("VIEW"),
|
||||
SEQUENCE("SEQUENCE"),
|
||||
TRIGGER("TRIGGER"),
|
||||
USER("USER"),
|
||||
INDEX("INDEX"),
|
||||
SESSION("SESSION"),
|
||||
PROCEDURE("PROCEDURE"),
|
||||
FUNCTION("FUNCTION"),
|
||||
|
||||
PRIMARY("PRIMARY"),
|
||||
KEY("KEY"),
|
||||
DEFAULT("DEFAULT"),
|
||||
CONSTRAINT("CONSTRAINT"),
|
||||
CHECK("CHECK"),
|
||||
UNIQUE("UNIQUE"),
|
||||
FOREIGN("FOREIGN"),
|
||||
REFERENCES("REFERENCES"),
|
||||
PRIMARY("PRIMARY"),
|
||||
KEY("KEY"),
|
||||
DEFAULT("DEFAULT"),
|
||||
CONSTRAINT("CONSTRAINT"),
|
||||
CHECK("CHECK"),
|
||||
UNIQUE("UNIQUE"),
|
||||
FOREIGN("FOREIGN"),
|
||||
REFERENCES("REFERENCES"),
|
||||
|
||||
EXPLAIN("EXPLAIN"),
|
||||
FOR("FOR"),
|
||||
EXPLAIN("EXPLAIN"),
|
||||
FOR("FOR"),
|
||||
IF("IF"),
|
||||
|
||||
|
||||
@@ -73,55 +73,55 @@ public enum Token {
|
||||
GLOBAL("GLOBAL"),
|
||||
ALL("ALL"),
|
||||
UNION("UNION"),
|
||||
EXCEPT("EXCEPT"),
|
||||
INTERSECT("INTERSECT"),
|
||||
EXCEPT("EXCEPT"),
|
||||
INTERSECT("INTERSECT"),
|
||||
MINUS("MINUS"),
|
||||
INNER("INNER"),
|
||||
LEFT("LEFT"),
|
||||
RIGHT("RIGHT"),
|
||||
FULL("FULL"),
|
||||
OUTER("OUTER"),
|
||||
INNER("INNER"),
|
||||
LEFT("LEFT"),
|
||||
RIGHT("RIGHT"),
|
||||
FULL("FULL"),
|
||||
OUTER("OUTER"),
|
||||
JOIN("JOIN"),
|
||||
STRAIGHT_JOIN("STRAIGHT_JOIN"),
|
||||
ON("ON"),
|
||||
SCHEMA("SCHEMA"),
|
||||
SCHEMA("SCHEMA"),
|
||||
CAST("CAST"),
|
||||
COLUMN("COLUMN"),
|
||||
USE("USE"),
|
||||
DATABASE("DATABASE"),
|
||||
TO("TO"),
|
||||
|
||||
AND("AND"),
|
||||
OR("OR"),
|
||||
XOR("XOR"),
|
||||
CASE("CASE"),
|
||||
WHEN("WHEN"),
|
||||
THEN("THEN"),
|
||||
AND("AND"),
|
||||
OR("OR"),
|
||||
XOR("XOR"),
|
||||
CASE("CASE"),
|
||||
WHEN("WHEN"),
|
||||
THEN("THEN"),
|
||||
ELSE("ELSE"),
|
||||
ELSIF("ELSIF"),
|
||||
END("END"),
|
||||
EXISTS("EXISTS"),
|
||||
END("END"),
|
||||
EXISTS("EXISTS"),
|
||||
IN("IN"),
|
||||
|
||||
NEW("NEW"),
|
||||
ASC("ASC"),
|
||||
DESC("DESC"),
|
||||
IS("IS"),
|
||||
LIKE("LIKE"),
|
||||
ESCAPE("ESCAPE"),
|
||||
BETWEEN("BETWEEN"),
|
||||
VALUES("VALUES"),
|
||||
NEW("NEW"),
|
||||
ASC("ASC"),
|
||||
DESC("DESC"),
|
||||
IS("IS"),
|
||||
LIKE("LIKE"),
|
||||
ESCAPE("ESCAPE"),
|
||||
BETWEEN("BETWEEN"),
|
||||
VALUES("VALUES"),
|
||||
INTERVAL("INTERVAL"),
|
||||
|
||||
LOCK("LOCK"),
|
||||
SOME("SOME"),
|
||||
LOCK("LOCK"),
|
||||
SOME("SOME"),
|
||||
ANY("ANY"),
|
||||
TRUNCATE("TRUNCATE"),
|
||||
|
||||
RETURN("RETURN"),
|
||||
|
||||
// mysql
|
||||
TRUE("TRUE"),
|
||||
TRUE("TRUE"),
|
||||
FALSE("FALSE"),
|
||||
LIMIT("LIMIT"),
|
||||
KILL("KILL"),
|
||||
@@ -132,7 +132,7 @@ public enum Token {
|
||||
SHOW("SHOW"),
|
||||
REPLACE("REPLACE"),
|
||||
PERIOD("PERIOD"),
|
||||
ELSEIF("ELSEIF"),
|
||||
|
||||
BITS,
|
||||
|
||||
// MySql procedure add by zz
|
||||
@@ -211,7 +211,6 @@ public enum Token {
|
||||
COMMIT("COMMIT"),
|
||||
SAVEPOINT("SAVEPOINT"),
|
||||
CROSS("CROSS"),
|
||||
RECORD("RECORD"),
|
||||
|
||||
PCTFREE("PCTFREE"),
|
||||
INITRANS("INITRANS"),
|
||||
@@ -254,7 +253,7 @@ public enum Token {
|
||||
|
||||
// hive
|
||||
|
||||
EOF,
|
||||
EOF,
|
||||
ERROR,
|
||||
IDENTIFIER,
|
||||
HINT,
|
||||
@@ -299,19 +298,19 @@ public enum Token {
|
||||
|
||||
UPSERT("UPSERT"), // Phoenix
|
||||
|
||||
LPAREN("("),
|
||||
RPAREN(")"),
|
||||
LBRACE("{"),
|
||||
RBRACE("}"),
|
||||
LBRACKET("["),
|
||||
RBRACKET("]"),
|
||||
SEMI(";"),
|
||||
COMMA(","),
|
||||
DOT("."),
|
||||
DOTDOT(".."),
|
||||
DOTDOTDOT("..,"),
|
||||
EQ("="),
|
||||
GT(">"),
|
||||
LPAREN("("),
|
||||
RPAREN(")"),
|
||||
LBRACE("{"),
|
||||
RBRACE("}"),
|
||||
LBRACKET("["),
|
||||
RBRACKET("]"),
|
||||
SEMI(";"),
|
||||
COMMA(","),
|
||||
DOT("."),
|
||||
DOTDOT(".."),
|
||||
DOTDOTDOT("..,"),
|
||||
EQ("="),
|
||||
GT(">"),
|
||||
LT("<"),
|
||||
LT_SUB_GT("<->"),
|
||||
BANG("!"),
|
||||
@@ -325,34 +324,34 @@ public enum Token {
|
||||
QUESQUES("??"),
|
||||
QUESBAR("?|"),
|
||||
QUESAMP("?&"),
|
||||
COLON(":"),
|
||||
COLONCOLON("::"),
|
||||
COLONEQ(":="),
|
||||
COLON(":"),
|
||||
COLONCOLON("::"),
|
||||
COLONEQ(":="),
|
||||
EQEQ("=="),
|
||||
EQGT("=>"),
|
||||
LTEQ("<="),
|
||||
LTEQGT("<=>"),
|
||||
LTGT("<>"),
|
||||
GTEQ(">="),
|
||||
BANGEQ("!="),
|
||||
BANGGT("!>"),
|
||||
LTEQ("<="),
|
||||
LTEQGT("<=>"),
|
||||
LTGT("<>"),
|
||||
GTEQ(">="),
|
||||
BANGEQ("!="),
|
||||
BANGGT("!>"),
|
||||
BANGLT("!<"),
|
||||
AMPAMP("&&"),
|
||||
BARBAR("||"),
|
||||
BARBARSLASH("||/"),
|
||||
BARSLASH("|/"),
|
||||
PLUS("+"),
|
||||
SUB("-"),
|
||||
SUBGT("->"),
|
||||
SUBGTGT("->>"),
|
||||
STAR("*"),
|
||||
SLASH("/"),
|
||||
AMP("&"),
|
||||
BAR("|"),
|
||||
AMPAMP("&&"),
|
||||
BARBAR("||"),
|
||||
BARBARSLASH("||/"),
|
||||
BARSLASH("|/"),
|
||||
PLUS("+"),
|
||||
SUB("-"),
|
||||
SUBGT("->"),
|
||||
SUBGTGT("->>"),
|
||||
STAR("*"),
|
||||
SLASH("/"),
|
||||
AMP("&"),
|
||||
BAR("|"),
|
||||
CARET("^"),
|
||||
CARETEQ("^="),
|
||||
PERCENT("%"),
|
||||
LTLT("<<"),
|
||||
PERCENT("%"),
|
||||
LTLT("<<"),
|
||||
GTGT(">>"),
|
||||
MONKEYS_AT("@"),
|
||||
MONKEYS_AT_AT("@@"),
|
||||
|
||||
Reference in New Issue
Block a user