improved sql parser.

This commit is contained in:
wenshao
2017-06-04 21:30:23 +08:00
parent de4bfb0ae3
commit 21ae9b5722
63 changed files with 1049 additions and 350 deletions
@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.*;
import com.alibaba.druid.sql.ast.expr.*;
import com.alibaba.druid.sql.ast.statement.SQLNotNullConstraint;
@@ -822,8 +823,10 @@ public class SQLExprParser extends SQLParser {
methodInvokeExpr = new SQLMethodInvokeExpr(methodName);
}
if (isAggreateFunction(methodName)) {
SQLAggregateExpr aggregateExpr = parseAggregateExpr(methodName);
String aggMethodName = SQLUtils.normalize(methodName);
if (isAggreateFunction(aggMethodName)) {
SQLAggregateExpr aggregateExpr = parseAggregateExpr(aggMethodName);
if (distinct) {
aggregateExpr.setOption(SQLAggregateOption.DISTINCT);
}