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/ast/statement/SQLInsertStatement.java
+9
View File
@@ -29,6 +29,7 @@ public class SQLInsertStatement extends SQLStatementImpl {
private static final long serialVersionUID = 1L;
private SQLName tableName;
private String alias;
private final List<SQLExpr> columns = new ArrayList<SQLExpr>();
private ValuesClause values;
@@ -38,6 +39,14 @@ public class SQLInsertStatement extends SQLStatementImpl {
}
public String getAlias() {
return alias;
}
public void setAlias(String alias) {
this.alias = alias;
}
public SQLName getTableName() {
return tableName;
}
src/main/java/com/alibaba/druid/sql/ast/statement/SQLSubqueryTableSource.java
+4 -1
View File
@@ -51,7 +51,10 @@ public class SQLSubqueryTableSource extends SQLTableSource {
@Override
protected void accept0(SQLASTVisitor visitor) {
throw new UnsupportedOperationException();
if (visitor.visit(this)) {
acceptChild(visitor, select);
}
visitor.endVisit(this);
}
public void output(StringBuffer buf) {
src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionOperator.java
+18
View File
@@ -0,0 +1,18 @@
package com.alibaba.druid.sql.ast.statement;
public enum SQLUnionOperator {
UNION("UNION"),
UNION_ALL("UNION ALL"),
MINUS("MINUS"),
INTERSECT("INTERSECT");
public final String name;
private SQLUnionOperator(String name) {
this.name = name;
}
public String toString() {
return name;
}
}
src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionQuery.java
+9 -9
View File
@@ -23,7 +23,15 @@ public class SQLUnionQuery extends SQLSelectQuery {
private SQLSelectQuery left;
private SQLSelectQuery right;
private boolean all;
private SQLUnionOperator operator = SQLUnionOperator.UNION;
public SQLUnionOperator getOperator() {
return operator;
}
public void setOperator(SQLUnionOperator operator) {
this.operator = operator;
}
public SQLUnionQuery(){
@@ -45,14 +53,6 @@ public class SQLUnionQuery extends SQLSelectQuery {
this.right = right;
}
public boolean isAll() {
return all;
}
public void setAll(boolean all) {
this.all = all;
}
@Override
protected void accept0(SQLASTVisitor visitor) {
if (visitor.visit(this)) {
src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java
+4
View File
@@ -98,6 +98,10 @@ public class MySqlExprParser extends SQLExprParser {
case FALSE:
lexer.nextToken();
return primaryRest(new MySqlBooleanExpr(false));
case LITERAL_ALIAS:
String aliasValue = lexer.stringVal();
lexer.nextToken();
return primaryRest(new SQLCharExpr(aliasValue));
default:
return super.primary();
}
src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java
+2
View File
@@ -102,8 +102,10 @@ public class MySqlLexer extends Lexer {
map.put("LOCK", Token.LOCK);
map.put("SOME", Token.SOME);
map.put("ANY", Token.ANY);
map.put("TRUE", Token.TRUE);
map.put("FALSE", Token.FALSE);
map.put("LIMIT", Token.LIMIT);
DEFAULT_MYSQL_KEYWORDS = new Keywords(map);
}
src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java
+36 -1
View File
@@ -38,6 +38,41 @@ public class MySqlSelectParser extends SQLSelectParser {
this(new MySqlLexer(sql));
this.lexer.nextToken();
}
@Override
protected final String as() throws ParserException {
String rtnValue = null;
if (lexer.token() == Token.AS) {
lexer.nextToken();
if (lexer.token() == Token.LITERAL_ALIAS) {
rtnValue = lexer.stringVal();
lexer.nextToken();
return rtnValue;
}
if (lexer.token() == Token.IDENTIFIER) {
rtnValue = lexer.stringVal();
lexer.nextToken();
return rtnValue;
}
throw new ParserException("Error", 0, 0);
}
if (lexer.token() == Token.LITERAL_ALIAS) {
rtnValue = lexer.stringVal();
lexer.nextToken();
} else if (lexer.token() == Token.IDENTIFIER) {
rtnValue = lexer.stringVal();
lexer.nextToken();
} else if (lexer.token() == Token.LITERAL_CHARS) {
rtnValue = "'" + lexer.stringVal() + "'";
lexer.nextToken();
}
return rtnValue;
}
@Override
protected SQLSelectQuery query() throws ParserException {
@@ -164,7 +199,7 @@ public class MySqlSelectParser extends SQLSelectParser {
queryBlock.setOrderBy(this.createExprParser().parseOrderBy());
if (identifierEquals("LIMIT")) {
if (lexer.token() == Token.LIMIT) {
lexer.nextToken();
MySqlSelectQueryBlock.Limit limit = new MySqlSelectQueryBlock.Limit();
src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java
+7 -2
View File
@@ -129,7 +129,7 @@ public class MySqlStatementParser extends SQLStatementParser {
deleteStatement.setOrderBy(orderBy);
}
if (identifierEquals("LIMIT")) {
if (lexer.token() == Token.LIMIT) {
lexer.nextToken();
MySqlSelectQueryBlock.Limit limit = new MySqlSelectQueryBlock.Limit();
@@ -317,7 +317,7 @@ public class MySqlStatementParser extends SQLStatementParser {
private MySqlShowWarningsStatement parseShowWarnings() throws ParserException {
MySqlShowWarningsStatement stmt = new MySqlShowWarningsStatement();
if (identifierEquals("LIMIT")) {
if (lexer.token() == Token.LIMIT) {
lexer.nextToken();
MySqlSelectQueryBlock.Limit limit = new MySqlSelectQueryBlock.Limit();
@@ -771,6 +771,11 @@ public class MySqlStatementParser extends SQLStatementParser {
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/dialect/mysql/visitor/MySqlOutputVisitor.java
+1 -1
View File
@@ -189,7 +189,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
}
if (select.getLimit() != null) {
print(" ");
println();
select.getLimit().accept(this);
}
src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OraclePriorExpr.java
+41
View File
@@ -0,0 +1,41 @@
package com.alibaba.druid.sql.dialect.oracle.ast.expr;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class OraclePriorExpr extends SQLExprImpl {
private static final long serialVersionUID = 1L;
private SQLExpr expr;
public OraclePriorExpr() {
}
public OraclePriorExpr(SQLExpr expr) {
this.expr = expr;
}
public SQLExpr getExpr() {
return expr;
}
public void setExpr(SQLExpr expr) {
this.expr = expr;
}
@Override
protected void accept0(SQLASTVisitor visitor) {
accept0((OracleASTVisitor) visitor);
}
protected void accept0(OracleASTVisitor visitor) {
if (visitor.visit(this)) {
acceptChild(visitor, expr);
}
visitor.endVisit(this);
}
}
src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectOrderByItem.java
+13 -4
View File
@@ -18,6 +18,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast.stmt;
import com.alibaba.druid.sql.ast.SQLOrderingSpecification;
import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem;
import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class OracleSelectOrderByItem extends SQLSelectOrderByItem {
@@ -36,6 +37,10 @@ public class OracleSelectOrderByItem extends SQLSelectOrderByItem {
public void setNullsOrderType(NullsOrderType nullsOrderType) {
this.nullsOrderType = nullsOrderType;
}
protected void accept0(SQLASTVisitor visitor) {
accept0((OracleASTVisitor) visitor);
}
protected void accept0(OracleASTVisitor visitor) {
if (visitor.visit(this)) {
@@ -47,12 +52,16 @@ public class OracleSelectOrderByItem extends SQLSelectOrderByItem {
public void output(StringBuffer buf) {
this.expr.output(buf);
if (SQLOrderingSpecification.ASC.equals(this.type)) buf.append(" ASC");
else if (SQLOrderingSpecification.DESC.equals(this.type)) {
if (SQLOrderingSpecification.ASC.equals(this.type)) {
buf.append(" ASC");
} else if (SQLOrderingSpecification.DESC.equals(this.type)) {
buf.append(" DESC");
}
if (NullsOrderType.NullsFirst.equals(this.nullsOrderType)) buf.append(" NULLS FIRST");
else if (NullsOrderType.NullsLast.equals(this.nullsOrderType)) buf.append(" NULLS LAST");
if (NullsOrderType.NullsFirst.equals(this.nullsOrderType)) {
buf.append(" NULLS FIRST");
} else if (NullsOrderType.NullsLast.equals(this.nullsOrderType)) {
buf.append(" NULLS LAST");
}
}
public static enum NullsOrderType {
src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleASTVisitor.java
+5
View File
@@ -35,6 +35,7 @@ import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleGroupComparisonCondit
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleGroupingSetsExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIntervalExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleOuterExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OraclePriorExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OraclePriorIdentifierExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleTableCollectionExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleTimestampExpr;
@@ -333,4 +334,8 @@ public interface OracleASTVisitor extends SQLASTVisitor {
boolean visit(GroupingSetExpr x);
void endVisit(GroupingSetExpr x);
boolean visit(OraclePriorExpr x);
void endVisit(OraclePriorExpr x);
}
src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleOutputVisitor.java
+13
View File
@@ -47,6 +47,7 @@ import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleGroupComparisonCondit
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleGroupingSetsExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIntervalExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleOuterExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OraclePriorExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OraclePriorIdentifierExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleTableCollectionExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleTimestampExpr;
@@ -1576,4 +1577,16 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
}
@Override
public boolean visit(OraclePriorExpr x) {
print("PRIOR ");
x.getExpr().accept(this);
return false;
}
@Override
public void endVisit(OraclePriorExpr x) {
}
}
src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleParameterizedOutputVisitor.java
+56
View File
@@ -2,8 +2,13 @@ package com.alibaba.druid.sql.dialect.oracle.ast.visitor;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLInListExpr;
import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr;
import com.alibaba.druid.sql.ast.expr.SQLNCharExpr;
import com.alibaba.druid.sql.ast.expr.SQLNumberExpr;
import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
public class OracleParameterizedOutputVisitor extends OracleOutputVisitor {
@@ -12,6 +17,37 @@ public class OracleParameterizedOutputVisitor extends OracleOutputVisitor {
super(appender);
}
public void println() {
print(' ');
}
public boolean visit(SQLInListExpr x) {
x.getExpr().accept(this);
if (x.isNot()) {
print(" NOT IN (##)");
} else {
print(" IN (##)");
}
return false;
}
public boolean visit(SQLBinaryOpExpr x) {
if (x.getLeft() instanceof SQLLiteralExpr && x.getRight() instanceof SQLLiteralExpr) {
print(x.getLeft().toString());
print(' ');
print(x.getOperator().name);
print(' ');
print(x.getRight().toString());
return false;
}
x = merge(x);
return super.visit(x);
}
public SQLBinaryOpExpr merge(SQLBinaryOpExpr x) {
if (x.getRight() instanceof SQLLiteralExpr) {
x = new SQLBinaryOpExpr(x.getLeft(), x.getOperator(), new SQLVariantRefExpr("?"));
@@ -52,5 +88,25 @@ public class OracleParameterizedOutputVisitor extends OracleOutputVisitor {
return x;
}
public boolean visit(SQLIntegerExpr x) {
print('?');
return false;
}
public boolean visit(SQLNumberExpr x) {
print('?');
return false;
}
public boolean visit(SQLCharExpr x) {
print('?');
return false;
}
public boolean visit(SQLNCharExpr x) {
print('?');
return false;
}
}
src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java
+13 -4
View File
@@ -25,6 +25,7 @@ import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleAnalytic;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleAnalyticWindowing;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIntervalExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIntervalType;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OraclePriorExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectOrderByItem;
import com.alibaba.druid.sql.parser.Lexer;
import com.alibaba.druid.sql.parser.ParserException;
@@ -89,6 +90,13 @@ public class OracleExprParser extends SQLExprParser {
} else {
throw new ParserException("syntax error : " + lexer.token());
}
case PRIOR:
lexer.nextToken();
primaryRest(new OraclePriorExpr(expr()));
case LITERAL_ALIAS:
String alias = '"' + lexer.stringVal() + '"';
lexer.nextToken();
return primaryRest(new SQLIdentifierExpr(alias));
default:
return super.primary();
}
@@ -157,7 +165,7 @@ public class OracleExprParser extends SQLExprParser {
exprList(over.getPartitionBy());
accept(Token.RPAREN);
} else {
over.getPartitionBy().add(expr());
exprList(over.getPartitionBy());
}
}
@@ -240,14 +248,15 @@ public class OracleExprParser extends SQLExprParser {
}
if (identifierEquals("NULLS")) {
if (lexer.stringVal().equalsIgnoreCase("FIRST")) {
lexer.nextToken();
if (identifierEquals("FIRST")) {
lexer.nextToken();
item.setNullsOrderType(OracleSelectOrderByItem.NullsOrderType.NullsFirst);
} else if (lexer.stringVal().equalsIgnoreCase("LAST")) {
} else if (identifierEquals("LAST")) {
lexer.nextToken();
item.setNullsOrderType(OracleSelectOrderByItem.NullsOrderType.NullsLast);
} else {
throw new ParserException("TODO");
throw new ParserException("TODO " + lexer.token());
}
}
src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java
+46 -14
View File
@@ -22,6 +22,7 @@ import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.statement.SQLSelectGroupByClause;
import com.alibaba.druid.sql.ast.statement.SQLSelectQuery;
import com.alibaba.druid.sql.ast.statement.SQLTableSource;
import com.alibaba.druid.sql.ast.statement.SQLUnionOperator;
import com.alibaba.druid.sql.ast.statement.SQLUnionQuery;
import com.alibaba.druid.sql.dialect.oracle.ast.OracleHint;
import com.alibaba.druid.sql.dialect.oracle.ast.clause.FlashbackQueryClause.AsOfFlashbackQueryClause;
@@ -145,10 +146,13 @@ public class OracleSelectParser extends SQLSelectParser {
if (lexer.token() == (Token.DISTINCT)) {
queryBlock.setDistionOption(SQLSetQuantifier.DISTINCT);
lexer.nextToken();
} else if (lexer.token() == (Token.UNIQUE)) {
queryBlock.setDistionOption(SQLSetQuantifier.UNIQUE);
lexer.nextToken();
} else if (lexer.token() == (Token.ALL)) {
queryBlock.setDistionOption(SQLSetQuantifier.ALL);
lexer.nextToken();
}
parseSelectList(queryBlock);
@@ -172,7 +176,7 @@ public class OracleSelectParser extends SQLSelectParser {
lexer.nextToken();
if (lexer.token() == (Token.ALL)) {
union.setAll(true);
union.setOperator(SQLUnionOperator.UNION_ALL);
lexer.nextToken();
}
@@ -183,12 +187,32 @@ public class OracleSelectParser extends SQLSelectParser {
return queryRest(union);
}
if (lexer.token() == (Token.INTERSECT)) {
throw new ParserException("TODO");
if (lexer.token() == Token.INTERSECT) {
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");
if (lexer.token() == Token.MINUS) {
lexer.nextToken();
SQLUnionQuery union = new SQLUnionQuery();
union.setLeft(selectQuery);
union.setOperator(SQLUnionOperator.MINUS);
SQLSelectQuery right = this.query();
union.setRight(right);
return union;
}
return selectQuery;
@@ -233,11 +257,16 @@ public class OracleSelectParser extends SQLSelectParser {
private void parseHierachical(OracleSelectQueryBlock queryBlock) {
OracleSelectHierachicalQueryClause hierachical = null;
if (identifierEquals("CONNECT")) {
if (lexer.token() == Token.CONNECT) {
hierachical = new OracleSelectHierachicalQueryClause();
lexer.nextToken();
accept(Token.BY);
if (lexer.token() == Token.PRIOR) {
lexer.nextToken();
hierachical.setPrior(true);
}
if (identifierEquals("NOCYCLE")) {
hierachical.setNoCycle(true);
}
@@ -283,13 +312,16 @@ public class OracleSelectParser extends SQLSelectParser {
if (lexer.token() == (Token.LPAREN)) {
lexer.nextToken();
OracleSelectSubqueryTableSource tableSource;
if (lexer.token() == (Token.SELECT)) tableSource = new OracleSelectSubqueryTableSource(select());
else {
throw new ParserException("TODO");
if (lexer.token() == Token.SELECT) {
tableSource = new OracleSelectSubqueryTableSource(select());
} else if (lexer.token() == (Token.LPAREN)) {
tableSource = new OracleSelectSubqueryTableSource(select());
} else {
throw new ParserException("TODO :" + lexer.token());
}
accept(Token.RPAREN);
parsePivot(tableSource);
parsePivot((OracleSelectTableSource) tableSource);
return parseTableSourceRest(tableSource);
}
@@ -442,7 +474,7 @@ public class OracleSelectParser extends SQLSelectParser {
OracleSelectJoin.JoinType joinType = null;
if (identifierEquals("LEFT")) {
if (lexer.token() == Token.LEFT) {
lexer.nextToken();
if (identifierEquals("OUTER")) {
lexer.nextToken();
@@ -451,7 +483,7 @@ public class OracleSelectParser extends SQLSelectParser {
joinType = OracleSelectJoin.JoinType.LEFT_OUTER_JOIN;
}
if (identifierEquals("RIGHT")) {
if (lexer.token() == Token.RIGHT) {
lexer.nextToken();
if (identifierEquals("OUTER")) {
lexer.nextToken();
@@ -475,7 +507,7 @@ public class OracleSelectParser extends SQLSelectParser {
joinType = OracleSelectJoin.JoinType.INNER_JOIN;
}
if (lexer.token() == (Token.JOIN)) {
if (lexer.token() == Token.JOIN) {
lexer.nextToken();
joinType = OracleSelectJoin.JoinType.JOIN;
}
@@ -491,7 +523,7 @@ public class OracleSelectParser extends SQLSelectParser {
join.setJoinType(joinType);
join.setRight(parseTableSource());
if (identifierEquals("ON")) {
if (lexer.token() == Token.ON) {
lexer.nextToken();
join.setCondition(this.createExprParser().expr());
} else if (identifierEquals("USING")) {
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"),
src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java
+13 -4
View File
@@ -70,6 +70,7 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem;
import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
import com.alibaba.druid.sql.ast.statement.SQLSetStatement;
import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource;
import com.alibaba.druid.sql.ast.statement.SQLTableElement;
import com.alibaba.druid.sql.ast.statement.SQLUnionQuery;
import com.alibaba.druid.sql.ast.statement.SQLUniqueConstraint;
@@ -664,10 +665,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter {
public boolean visit(SQLUnionQuery x) {
x.getLeft().accept(this);
println();
print("UNION");
if (x.isAll()) {
print(" ALL");
}
print(x.getOperator().name);
println();
x.getRight().accept(this);
return false;
@@ -817,4 +815,15 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter {
return false;
}
@Override
public boolean visit(SQLSubqueryTableSource x) {
print("(");
incrementIndent();
x.getSelect().accept(this);
decrementIndent();
print(")");
return false;
}
}
src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java
+5
View File
@@ -68,6 +68,7 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem;
import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
import com.alibaba.druid.sql.ast.statement.SQLSetStatement;
import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource;
import com.alibaba.druid.sql.ast.statement.SQLTableElement;
import com.alibaba.druid.sql.ast.statement.SQLUnionQuery;
import com.alibaba.druid.sql.ast.statement.SQLUniqueConstraint;
@@ -324,4 +325,8 @@ public interface SQLASTVisitor {
void endVisit(SQLListExpr x);
boolean visit(SQLListExpr x);
void endVisit(SQLSubqueryTableSource x);
boolean visit(SQLSubqueryTableSource x);
}
src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java
+12 -1
View File
@@ -69,6 +69,7 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem;
import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
import com.alibaba.druid.sql.ast.statement.SQLSetStatement;
import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource;
import com.alibaba.druid.sql.ast.statement.SQLTableElement;
import com.alibaba.druid.sql.ast.statement.SQLUnionQuery;
import com.alibaba.druid.sql.ast.statement.SQLUniqueConstraint;
@@ -550,6 +551,16 @@ public class SQLASTVisitorAdapter implements SQLASTVisitor {
@Override
public boolean visit(SQLListExpr x) {
return false;
return true;
}
@Override
public void endVisit(SQLSubqueryTableSource x) {
}
@Override
public boolean visit(SQLSubqueryTableSource x) {
return true;
}
}