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

refactor sql parser

Browse Source
This commit is contained in:
高铁
2016-01-10 16:59:11 +08:00
parent fa265636f0
commit d4066b101c
30 changed files with 174 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java
+19 -6
View File
@@ -19,6 +19,7 @@ import java.util.List;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLOrderBy;
import com.alibaba.druid.sql.ast.SQLOrderingSpecification;
import com.alibaba.druid.sql.ast.SQLSetQuantifier;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
@@ -34,6 +35,7 @@ import com.alibaba.druid.sql.ast.statement.SQLUnionOperator;
import com.alibaba.druid.sql.ast.statement.SQLUnionQuery;
import com.alibaba.druid.sql.ast.statement.SQLUnionQueryTableSource;
import com.alibaba.druid.sql.ast.statement.SQLWithSubqueryClause;
import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlGroupByItemExpr;
import com.alibaba.druid.util.JdbcConstants;
public class SQLSelectParser extends SQLParser {
@@ -265,7 +267,7 @@ public class SQLSelectParser extends SQLParser {
SQLSelectGroupByClause groupBy = new SQLSelectGroupByClause();
for (;;) {
SQLExpr item = this.exprParser.expr();
SQLExpr item = parseGroupByItem();
item.setParent(groupBy);
groupBy.addItem(item);
@@ -291,10 +293,6 @@ public class SQLSelectParser extends SQLParser {
groupBy.setWithRollUp(true);
}
if(JdbcConstants.MYSQL.equals(getDbType()) && lexer.token() == Token.DESC) {
lexer.nextToken(); // skip
}
queryBlock.setGroupBy(groupBy);
} else if (lexer.token() == (Token.HAVING)) {
lexer.nextToken();
@@ -307,7 +305,7 @@ public class SQLSelectParser extends SQLParser {
accept(Token.BY);
for (;;) {
SQLExpr item = this.exprParser.expr();
SQLExpr item = parseGroupByItem();
item.setParent(groupBy);
groupBy.addItem(item);
@@ -335,6 +333,21 @@ public class SQLSelectParser extends SQLParser {
}
}
protected SQLExpr parseGroupByItem() {
SQLExpr item = this.exprParser.expr();
if(JdbcConstants.MYSQL.equals(getDbType())) {
if (lexer.token() == Token.DESC) {
lexer.nextToken(); // skip
item =new MySqlGroupByItemExpr(item, SQLOrderingSpecification.DESC);
} else if (lexer.token() == Token.ASC) {
lexer.nextToken(); // skip
item =new MySqlGroupByItemExpr(item, SQLOrderingSpecification.ASC);
}
}
return item;
}
protected void parseSelectList(SQLSelectQueryBlock queryBlock) {
final List<SQLSelectItem> selectList = queryBlock.getSelectList();
for (;;) {