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

mysql parser refactor.

Browse Source
This commit is contained in:
wenshao
2017-08-29 14:33:44 +08:00
parent 833a9b5a65
commit 4a4fffbbb2
197 changed files with 3040 additions and 1037 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java
+35 -15
View File
@@ -21,6 +21,7 @@ import com.alibaba.druid.sql.ast.*;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.statement.*;
import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlOrderingExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectQueryBlock;
import com.alibaba.druid.util.FNVUtils;
import com.alibaba.druid.util.JdbcConstants;
@@ -48,11 +49,25 @@ public class SQLSelectParser extends SQLParser {
select.setWithSubQuery(with);
}
select.setQuery(query());
select.setOrderBy(parseOrderBy());
SQLSelectQuery query = query();
select.setQuery(query);
if (select.getOrderBy() == null) {
select.setOrderBy(parseOrderBy());
SQLOrderBy orderBy = this.parseOrderBy();
if (query instanceof SQLSelectQueryBlock) {
SQLSelectQueryBlock queryBlock = (SQLSelectQueryBlock) query;
if (queryBlock.getOrderBy() == null) {
queryBlock.setOrderBy(orderBy);
} else {
select.setOrderBy(orderBy);
}
if (orderBy != null) {
parseFetchClause(queryBlock);
}
} else {
select.setOrderBy(orderBy);
}
while (lexer.token == Token.HINT) {
@@ -609,17 +624,20 @@ public class SQLSelectParser extends SQLParser {
rightTableSource = new SQLExprTableSource(expr);
}
if (lexer.identifierEquals("USING")) {
if (lexer.token == Token.USING
||lexer.identifierEquals(FNVUtils.USING))
{
Lexer.SavePoint savePoint = lexer.mark();
lexer.nextToken();
if (lexer.token == Token.LPAREN) {
lexer.nextToken();
this.exprParser.exprList(join.getUsing(), join);
accept(Token.RPAREN);
} else {
join.getUsing().add(this.expr());
}
join.setAlias(this.tableAlias());
if (lexer.token == Token.LPAREN
|| lexer.token == Token.IDENTIFIER) {
lexer.reset(savePoint);
join.setRight(rightTableSource);
return join;
} else {
join.setAlias(this.tableAlias());
}
} else {
rightTableSource.setAlias(this.tableAlias());
@@ -659,14 +677,16 @@ public class SQLSelectParser extends SQLParser {
if (lexer.token == Token.ON) {
lexer.nextToken();
join.setCondition(expr());
} else if (lexer.identifierEquals("USING")) {
} else if (lexer.token == Token.USING
|| lexer.identifierEquals(FNVUtils.USING)) {
Lexer.SavePoint savePoint = lexer.mark();
lexer.nextToken();
if (lexer.token == Token.LPAREN) {
lexer.nextToken();
this.exprParser.exprList(join.getUsing(), join);
accept(Token.RPAREN);
} else {
join.getUsing().add(this.expr());
lexer.reset(savePoint);
}
}