diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java index 700ec074ae..4431108e9f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java @@ -109,11 +109,18 @@ public class PGOutputVisitor extends SQLASTOutputVisitor implements PGASTVisitor } else if (SQLSetQuantifier.DISTINCT == x.getDistionOption()) { print0(ucase ? "DISTINCT " : "distinct "); - if (x.getDistinctOn() != null && x.getDistinctOn().size() > 0) { + List distinctOn = x.getDistinctOn(); + if (distinctOn != null && distinctOn.size() > 0) { print0(ucase ? "ON " : "on "); - print0("("); - printAndAccept(x.getDistinctOn(), ", "); - print0(") "); + + if (distinctOn.size() == 1 && distinctOn.get(0) instanceof SQLListExpr) { + printExpr(distinctOn.get(0)); + print(' '); + } else { + print0("("); + printAndAccept(distinctOn, ", "); + print0(") "); + } } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java index d62828b2c2..00f31bd63c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java @@ -88,6 +88,10 @@ public class PostgresqlResourceTest extends PGTest { exec_test("bvt/parser/postgresql-12.txt"); } + public void test_13() throws Exception { + exec_test("bvt/parser/postgresql-13.txt"); + } + public void exec_test(String resource) throws Exception { System.out.println(resource); InputStream is = null; diff --git a/src/test/resources/bvt/parser/postgresql-13.txt b/src/test/resources/bvt/parser/postgresql-13.txt new file mode 100644 index 0000000000..4b8c092d4f --- /dev/null +++ b/src/test/resources/bvt/parser/postgresql-13.txt @@ -0,0 +1,5 @@ +select distinct on (a,b) a,b from table order by a,b +--------------------------- +SELECT DISTINCT ON (a, b) a, b +FROM table +ORDER BY a, b \ No newline at end of file