bug fixed sql parser aggregate distinct output

This commit is contained in:
wenshao
2012-07-18 07:29:47 +08:00
parent 5a3237cd1f
commit 4b64b07e38
12 changed files with 82 additions and 23 deletions
@@ -675,16 +675,18 @@ public class SQLExprParser extends SQLParser {
return false;
}
protected SQLAggregateExpr parseAggregateExpr(String method_name) throws ParserException {
protected SQLAggregateExpr parseAggregateExpr(String methodName) throws ParserException {
methodName = methodName.toUpperCase();
SQLAggregateExpr aggregateExpr;
if (lexer.token() == Token.ALL) {
aggregateExpr = new SQLAggregateExpr(method_name, 1);
aggregateExpr = new SQLAggregateExpr(methodName, SQLAggregateExpr.Option.ALL);
lexer.nextToken();
} else if (lexer.token() == Token.DISTINCT) {
aggregateExpr = new SQLAggregateExpr(method_name, 0);
aggregateExpr = new SQLAggregateExpr(methodName, SQLAggregateExpr.Option.DISTINCT);
lexer.nextToken();
} else {
aggregateExpr = new SQLAggregateExpr(method_name, 1);
aggregateExpr = new SQLAggregateExpr(methodName);
}
exprList(aggregateExpr.getArguments());