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

0.2.15

Browse Source
This commit is contained in:
wenshao
2013-03-28 09:21:08 +08:00
parent 4d85e96301
commit d22d27ef01
20 changed files with 195 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java
+13 -9
View File
@@ -169,14 +169,14 @@ public class SQLSelectParser extends SQLParser {
protected void withSubquery(SQLSelect select) {
if (lexer.token() == Token.WITH) {
lexer.nextToken();
SQLWithSubqueryClause withQueryClause = new SQLWithSubqueryClause();
if (lexer.token == Token.RECURSIVE || identifierEquals("RECURSIVE")) {
lexer.nextToken();
withQueryClause.setRecursive(true);
}
for (;;) {
SQLWithSubqueryClause.Entry entry = new SQLWithSubqueryClause.Entry();
entry.setName((SQLIdentifierExpr) this.exprParser.name());
@@ -252,7 +252,7 @@ public class SQLSelectParser extends SQLParser {
if (lexer.token() == Token.IDENTIFIER) {
expr = new SQLIdentifierExpr(lexer.stringVal());
lexer.nextTokenComma();
if (lexer.token() != Token.COMMA) {
expr = this.exprParser.primaryRest(expr);
expr = this.exprParser.exprRest(expr);
@@ -261,13 +261,13 @@ public class SQLSelectParser extends SQLParser {
expr = expr();
}
final String alias = as();
final SQLSelectItem selectItem = new SQLSelectItem(expr, alias);
selectList.add(selectItem);
if (lexer.token() != Token.COMMA) {
break;
}
lexer.nextToken();
}
}
@@ -388,9 +388,13 @@ public class SQLSelectParser extends SQLParser {
join.setCondition(expr());
} else if (identifierEquals("USING")) {
lexer.nextToken();
accept(Token.LPAREN);
this.exprParser.exprList(join.getUsing());
accept(Token.RPAREN);
if (lexer.token() == Token.LPAREN) {
lexer.nextToken();
this.exprParser.exprList(join.getUsing());
accept(Token.RPAREN);
} else {
join.getUsing().add(this.expr());
}
}
return parseTableSourceRest(join);