improved postgresql parser. for issue #2484

This commit is contained in:
wenshao
2018-04-12 20:55:22 +08:00
parent b84e7b946a
commit 3ea9c0c8ba
4 changed files with 88 additions and 7 deletions
@@ -3029,4 +3029,12 @@ public class PGOutputVisitor extends SQLASTOutputVisitor implements PGASTVisitor
printAndAccept(x.getColumns(), ", ");
return false;
}
protected void visitAggreateRest(SQLAggregateExpr x) {
SQLOrderBy orderBy = x.getWithinGroup();
if (orderBy != null) {
print(' ');
orderBy.accept(this);
}
}
}
@@ -1099,13 +1099,30 @@ public class SQLExprParser extends SQLParser {
methodInvokeExpr.setUsing(using);
}
SQLAggregateExpr aggregateExpr = null;
if (lexer.token == Token.ORDER) {
lexer.nextToken();
accept(Token.BY);
aggregateExpr = new SQLAggregateExpr(methodName);
aggregateExpr.getArguments().addAll(methodInvokeExpr.getParameters());
SQLOrderBy orderBy = new SQLOrderBy();
this.orderBy(orderBy.getItems(), orderBy);
aggregateExpr.setWithinGroup(orderBy);
}
accept(Token.RPAREN);
if (lexer.token == Token.OVER) {
SQLAggregateExpr aggregateExpr = new SQLAggregateExpr(methodName);
aggregateExpr.getArguments().addAll(methodInvokeExpr.getParameters());
if (aggregateExpr == null) {
aggregateExpr = new SQLAggregateExpr(methodName);
aggregateExpr.getArguments().addAll(methodInvokeExpr.getParameters());
}
over(aggregateExpr);
}
if (aggregateExpr != null) {
return primaryRest(aggregateExpr);
}
@@ -1516,11 +1516,13 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
print(')');
SQLOrderBy withGroup = x.getWithinGroup();
if (withGroup != null) {
print0(ucase ? " WITHIN GROUP (" : " within group (");
visit(withGroup);
print(')');
if (!JdbcConstants.POSTGRESQL.equals(dbType)) {
SQLOrderBy withGroup = x.getWithinGroup();
if (withGroup != null) {
print0(ucase ? " WITHIN GROUP (" : " within group (");
visit(withGroup);
print(')');
}
}
SQLKeep keep = x.getKeep();