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

sql parser refactor

Browse Source
This commit is contained in:
温少
2012-05-20 14:16:50 +08:00
parent 230b78d337
commit 30a4b04771
5 changed files with 18 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java
+5 -9
View File
@@ -65,7 +65,7 @@ public class SQLSelectParser extends SQLParser {
public SQLUnionQuery unionRest(SQLUnionQuery union) {
if (lexer.token() == Token.ORDER) {
SQLOrderBy orderBy = this.createExprParser().parseOrderBy();
SQLOrderBy orderBy = this.exprParser.parseOrderBy();
union.setOrderBy(orderBy);
return unionRest(union);
}
@@ -193,7 +193,7 @@ public class SQLSelectParser extends SQLParser {
lexer.nextToken();
SQLSelectGroupByClause groupBy = new SQLSelectGroupByClause();
groupBy.setHaving(this.createExprParser().expr());
groupBy.setHaving(this.expr());
queryBlock.setGroupBy(groupBy);
}
}
@@ -252,7 +252,7 @@ public class SQLSelectParser extends SQLParser {
private void parseTableSourceQueryTableExpr(SQLExprTableSource tableReference) throws ParserException {
if (lexer.token() == Token.LITERAL_ALIAS || lexer.token() == Token.IDENTIFIED
|| lexer.token() == Token.LITERAL_CHARS) {
tableReference.setExpr(this.createExprParser().name());
tableReference.setExpr(this.exprParser.name());
return;
}
@@ -327,15 +327,11 @@ public class SQLSelectParser extends SQLParser {
}
public SQLExpr expr() {
return createExprParser().expr();
}
protected SQLExprParser createExprParser() {
return new SQLExprParser(lexer);
return this.exprParser.expr();
}
public SQLOrderBy parseOrderBy() throws ParserException {
return createExprParser().parseOrderBy();
return this.exprParser.parseOrderBy();
}
public void acceptKeyword(String ident) {