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@157 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-05-20 07:15:47 +00:00
parent 107b62f003
commit 856f0e6011
6 changed files with 62 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java
+3 -3
View File
@@ -52,7 +52,7 @@ public class MySqlExprParser extends SQLExprParser {
public SQLExpr relationalRest(SQLExpr expr) throws ParserException {
if (lexer.token() == Token.IDENTIFIER && "REGEXP".equalsIgnoreCase(lexer.stringVal())) {
lexer.nextToken();
SQLExpr rightExp = bitOr();
SQLExpr rightExp = equality();
rightExp = relationalRest(rightExp);
@@ -65,7 +65,7 @@ public class MySqlExprParser extends SQLExprParser {
public SQLExpr multiplicativeRest(SQLExpr expr) throws ParserException {
if (lexer.token() == Token.IDENTIFIER && "MOD".equalsIgnoreCase(lexer.stringVal())) {
lexer.nextToken();
SQLExpr rightExp = bitOr();
SQLExpr rightExp = primary();
rightExp = relationalRest(rightExp);
@@ -78,7 +78,7 @@ public class MySqlExprParser extends SQLExprParser {
public SQLExpr notRationalRest(SQLExpr expr) {
if (lexer.token() == Token.IDENTIFIER && "REGEXP".equalsIgnoreCase(lexer.stringVal())) {
lexer.nextToken();
SQLExpr rightExp = bitOr();
SQLExpr rightExp = primary();
rightExp = relationalRest(rightExp);
src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+17 -25
View File
@@ -93,7 +93,6 @@ public class SQLExprParser extends SQLParser {
expr = relationalRest(expr);
expr = equalityRest(expr);
expr = andRest(expr);
expr = xorRest(expr);
expr = orRest(expr);
return expr;
@@ -642,7 +641,7 @@ public class SQLExprParser extends SQLParser {
}
public final SQLExpr equality() throws ParserException {
SQLExpr expr = relational();
SQLExpr expr = multiplicative();
return equalityRest(expr);
}
@@ -650,14 +649,14 @@ public class SQLExprParser extends SQLParser {
SQLExpr rightExp;
if (lexer.token() == Token.EQ) {
lexer.nextToken();
rightExp = relational();
rightExp = additive();
rightExp = equalityRest(rightExp);
expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.Equality, rightExp);
} else if (lexer.token() == Token.BANGEQ) {
lexer.nextToken();
rightExp = relational();
rightExp = additive();
rightExp = equalityRest(rightExp);
@@ -754,7 +753,7 @@ public class SQLExprParser extends SQLParser {
public final SQLExpr andRest(SQLExpr expr) throws ParserException {
if (lexer.token() == Token.AND || lexer.token() == Token.AMPAMP) {
lexer.nextToken();
SQLExpr rightExp = equality();
SQLExpr rightExp = relational();
expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.BooleanAnd, rightExp);
expr = andRest(expr);
@@ -763,38 +762,31 @@ public class SQLExprParser extends SQLParser {
return expr;
}
public final SQLExpr xor() throws ParserException {
SQLExpr expr = relational();
return xorRest(expr);
}
public final SQLExpr xorRest(SQLExpr expr) throws ParserException {
if (lexer.token() == Token.XOR) {
lexer.nextToken();
SQLExpr rightExp = equality();
expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.BooleanAnd, rightExp);
expr = xorRest(expr);
}
return expr;
}
public final SQLExpr or() throws ParserException {
SQLExpr expr = and();
return orRest(expr);
}
public final SQLExpr orRest(SQLExpr expr) throws ParserException {
while (lexer.token() == Token.OR) {
if (lexer.token() == Token.OR) {
lexer.nextToken();
SQLExpr rightExp = and();
SQLExpr rightExp = relational();
expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.BooleanOr, rightExp);
expr = orRest(expr);
} else if (lexer.token() == Token.XOR) {
lexer.nextToken();
SQLExpr rightExp = relational();
expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.BooleanXor, rightExp);
expr = orRest(expr);
}
return expr;
}
public final SQLExpr relational() throws ParserException {
SQLExpr expr = bitOr();
SQLExpr expr = equality();
return relationalRest(expr);
}
@@ -804,7 +796,7 @@ public class SQLExprParser extends SQLParser {
if (lexer.token() == Token.LT) {
lexer.nextToken();
rightExp = bitOr();
rightExp = equality();
rightExp = relationalRest(rightExp);