Skip to content

[PostgreSQL] Parse GROUP BY DISTINCT with GROUPING SETS #2830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
2748109647 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[PostgreSQL] Parse GROUP BY DISTINCT with GROUPING SETS #2830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/main/java/net/sf/jsqlparser/statement/select/GroupByElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,21 @@ public enum SortDirection {
private List<ExpressionList<Expression>> groupingSets = new ArrayList<>();
// postgres rollup is an ExpressionList
private boolean mysqlWithRollup = false;
private boolean distinct = false;

public boolean isUsingBrackets() {
return groupByExpressions.isUsingBrackets();
}

public boolean isDistinct() {
return distinct;
}

public GroupByElement setDistinct(boolean distinct) {
this.distinct = distinct;
return this;
}

public <T, S> T accept(GroupByVisitor<T> groupByVisitor, S context) {
return groupByVisitor.visit(this, context);
}
Expand Down Expand Up @@ -115,6 +125,9 @@ public String toString() {
public void appendTo(StringBuilder builder, Consumer<ExpressionList<?>> listRenderer,
Consumer<Expression> expressionRenderer) {
builder.append("GROUP BY ");
if (distinct) {
builder.append("DISTINCT ");
}
if (groupByExpressions != null) {
if (hasGroupBySortDirections()) {
appendOrderedExpressions(builder, expressionRenderer);
Expand Down
1 change: 1 addition & 0 deletions src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10452,6 +10452,7 @@ GroupByElement GroupByColumnReferences():
}
{
<K_GROUP> <K_BY>
[ LOOKAHEAD(<K_DISTINCT>) <K_DISTINCT> { groupBy.setDistinct(true); } ]
(
LOOKAHEAD(2) (
<K_GROUPING> <K_SETS>
Expand Down
7 changes: 7 additions & 0 deletions src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4792,6 +4792,13 @@ public void testGroupingSets3() throws JSQLParserException {
"SELECT COL_1 FROM TABLE_1 GROUP BY GROUPING SETS (COL_1, ())");
}

@Test
public void testGroupingSetsDistinctIssue2785() throws JSQLParserException {
PlainSelect select = (PlainSelect) assertSqlCanBeParsedAndDeparsed(
"SELECT 1 GROUP BY DISTINCT GROUPING SETS ((1), (1))");
assertTrue(select.getGroupBy().isDistinct());
}

@Test
public void testLongQualifiedNamesIssue763() throws JSQLParserException {
assertSqlCanBeParsedAndDeparsed(
Expand Down