Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

修正运算符优先级别处理不当的问题

Browse Source 
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@160 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-05-20 16:05:38 +00:00
parent 2b19baff03
commit 431e080bdf
54 changed files with 1085 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+35 -13
View File
@@ -382,6 +382,14 @@ public class SQLExprParser extends SQLParser {
sqlExpr = someExpr;
break;
case KEY:
lexer.nextToken();
sqlExpr = new SQLIdentifierExpr("KEY");
break;
case DISTINCT:
lexer.nextToken();
sqlExpr = new SQLIdentifierExpr("DISTINCT");
break;
case ALL:
lexer.nextToken();
SQLAllExpr allExpr = new SQLAllExpr();
@@ -422,13 +430,18 @@ public class SQLExprParser extends SQLParser {
lexer.nextToken();
expr = new SQLPropertyExpr(expr, "*");
} else {
if (lexer.token() != Token.IDENTIFIER) {
throw new ParserException("error");
String name;
if (lexer.token() == Token.KEY) {
name = "KEY";
lexer.nextToken();
} else if (lexer.token() != Token.IDENTIFIER) {
throw new ParserException("error : " + lexer.stringVal());
} else {
name = lexer.stringVal();
lexer.nextToken();
}
String name = lexer.stringVal();
lexer.nextToken();
if (lexer.token() == Token.LPAREN) {
lexer.nextToken();
@@ -436,7 +449,12 @@ public class SQLExprParser extends SQLParser {
if (lexer.token() == Token.RPAREN) {
lexer.nextToken();
} else {
exprList(methodInvokeExpr.getParameters());
if (lexer.token() == Token.PLUS) {
methodInvokeExpr.getParameters().add(new SQLIdentifierExpr("+"));
lexer.nextToken();
} else {
exprList(methodInvokeExpr.getParameters());
}
accept(Token.RPAREN);
}
expr = methodInvokeExpr;
@@ -521,14 +539,18 @@ public class SQLExprParser extends SQLParser {
}
public final SQLName name() throws ParserException {
if (lexer.token() != Token.IDENTIFIER) {
String identName;
if (lexer.token() == Token.LITERAL_ALIAS) {
identName = '"' + lexer.stringVal() + '"';
lexer.nextToken();
} else if (lexer.token() == Token.IDENTIFIER) {
identName = lexer.stringVal();
lexer.nextToken();
} else {
throw new ParserException("error");
}
String identName = lexer.stringVal();
lexer.nextToken();
SQLName name = new SQLIdentifierExpr(identName);
if (lexer.token() == Token.DOT) {
@@ -770,13 +792,13 @@ public class SQLExprParser extends SQLParser {
public final SQLExpr orRest(SQLExpr expr) throws ParserException {
if (lexer.token() == Token.OR) {
lexer.nextToken();
SQLExpr rightExp = relational();
SQLExpr rightExp = and();
expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.BooleanOr, rightExp);
expr = orRest(expr);
} else if (lexer.token() == Token.XOR) {
lexer.nextToken();
SQLExpr rightExp = relational();
SQLExpr rightExp = and();
expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.BooleanXor, rightExp);
expr = orRest(expr);