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/Lexer.java
+14 -1
View File
@@ -446,6 +446,8 @@ public class Lexer {
}
private final void scanAlias() {
np = bp;
for (;;) {
if (bp >= buflen) {
lexError(tokenPos, "unclosed.str.lit");
@@ -457,7 +459,7 @@ public class Lexer {
if (ch == '\"') {
scanChar();
token = LITERAL_ALIAS;
return;
break;
}
if (sp == sbuf.length) {
@@ -466,6 +468,8 @@ public class Lexer {
sbuf[sp++] = ch;
}
}
stringVal = new String(buf, np + 1, sp);
}
public void scanVariable() {
@@ -480,6 +484,14 @@ public class Lexer {
np = bp;
sp = 1;
char ch;
if (buf[bp + 1] == '@') {
ch = buf[++bp];
hash = 31 * hash + ch;
sp++;
}
for (;;) {
ch = buf[++bp];
@@ -522,6 +534,7 @@ public class Lexer {
if (ch == '*' && buf[bp + 1] == '/') {
sp += 2;
scanChar();
scanChar();
break;
}
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);
src/main/java/com/alibaba/druid/sql/parser/SQLParser.java
+19 -9
View File
@@ -41,35 +41,45 @@ public class SQLParser {
}
}
protected final String as() throws ParserException {
String rtnValue = null;
protected String as() throws ParserException {
String alias = null;
if (lexer.token() == Token.AS) {
lexer.nextToken();
if (lexer.token() == Token.LITERAL_ALIAS) {
rtnValue = lexer.stringVal();
alias = '"' + lexer.stringVal() + '"';
lexer.nextToken();
return rtnValue;
return alias;
}
if (lexer.token() == Token.IDENTIFIER) {
rtnValue = lexer.stringVal();
alias = lexer.stringVal();
lexer.nextToken();
return rtnValue;
return alias;
}
if (lexer.token() == Token.KEY) {
lexer.nextToken();
alias = "KEY";
return alias;
}
throw new ParserException("Error", 0, 0);
}
if (lexer.token() == Token.LITERAL_ALIAS) {
rtnValue = lexer.stringVal();
alias = '"' + lexer.stringVal() + '"';
lexer.nextToken();
} else if (lexer.token() == Token.IDENTIFIER) {
rtnValue = lexer.stringVal();
alias = lexer.stringVal();
lexer.nextToken();
} else if (lexer.token() == Token.KEY) {
lexer.nextToken();
alias = "KEY";
return alias;
}
return rtnValue;
return alias;
}
public void accept(Token token) {
src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java
+35 -8
View File
@@ -18,15 +18,16 @@ package com.alibaba.druid.sql.parser;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLOrderBy;
import com.alibaba.druid.sql.ast.SQLSetQuantifier;
import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource;
import com.alibaba.druid.sql.ast.statement.SQLSelect;
import com.alibaba.druid.sql.ast.statement.SQLSelectGroupByClause;
import com.alibaba.druid.sql.ast.statement.SQLSelectItem;
import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource;
import com.alibaba.druid.sql.ast.statement.SQLSelectQuery;
import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource;
import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
import com.alibaba.druid.sql.ast.statement.SQLTableSource;
import com.alibaba.druid.sql.ast.statement.SQLUnionOperator;
import com.alibaba.druid.sql.ast.statement.SQLUnionQuery;
public class SQLSelectParser extends SQLParser {
@@ -60,7 +61,7 @@ public class SQLSelectParser extends SQLParser {
union.setLeft(selectQuery);
if (lexer.token() == Token.ALL) {
union.setAll(true);
union.setOperator(SQLUnionOperator.UNION_ALL);
lexer.nextToken();
}
@@ -71,11 +72,31 @@ public class SQLSelectParser extends SQLParser {
}
if (lexer.token() == Token.INTERSECT) {
throw new ParserException("TODO");
lexer.nextToken();
SQLUnionQuery union = new SQLUnionQuery();
union.setLeft(selectQuery);
union.setOperator(SQLUnionOperator.INTERSECT);
SQLSelectQuery right = this.query();
union.setRight(right);
return union;
}
if (lexer.token() == Token.MINUS) {
throw new ParserException("TODO");
lexer.nextToken();
SQLUnionQuery union = new SQLUnionQuery();
union.setLeft(selectQuery);
union.setOperator(SQLUnionOperator.MINUS);
SQLSelectQuery right = this.query();
union.setRight(right);
return union;
}
return selectQuery;
@@ -174,15 +195,17 @@ public class SQLSelectParser extends SQLParser {
lexer.nextToken();
SQLTableSource tableSource;
if (lexer.token() == Token.SELECT) {
tableSource = new SQLSubqueryTableSource(select());
SQLSelect select = select();
accept(Token.RPAREN);
queryRest(select.getQuery());
tableSource = new SQLSubqueryTableSource(select);
} else if (lexer.token() == Token.LPAREN) {
tableSource = parseTableSource();
accept(Token.RPAREN);
} else {
throw new ParserException("TODO");
}
accept(Token.RPAREN);
return parseTableSourceRest(tableSource);
}
@@ -258,6 +281,10 @@ public class SQLSelectParser extends SQLParser {
return parseTableSourceRest(join);
}
if (lexer.token() == Token.UNION) {
throw new SQLParseException("TODO");
}
return tableSource;
}
src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java
+5
View File
@@ -138,6 +138,11 @@ public class SQLStatementParser extends SQLParser {
SQLName tableName = this.exprParser.name();
insertStatement.setTableName(tableName);
if (lexer.token() == Token.IDENTIFIER) {
insertStatement.setAlias(lexer.stringVal());
lexer.nextToken();
}
if (lexer.token() == (Token.LPAREN)) {
lexer.nextToken();
src/main/java/com/alibaba/druid/sql/parser/Token.java
+1
View File
@@ -96,6 +96,7 @@ public enum Token {
// mysql
TRUE("TRUE"),
FALSE("FALSE"),
LIMIT("LIMIT"),
// oracle
START("START"),