Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@

public PlainSelect addGroupByColumnReference(Expression expr) {
this.groupBy = Optional.ofNullable(groupBy).orElseGet(GroupByElement::new);
this.groupBy.addGroupByExpression(expr);

Check warning on line 477 in src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java

View workflow job for this annotation

GitHub Actions / Maven Verify (macos-latest)

[deprecation] addGroupByExpression(Expression) in GroupByElement has been deprecated

Check warning on line 477 in src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java

View workflow job for this annotation

GitHub Actions / Maven Verify (windows-latest)

[deprecation] addGroupByExpression(Expression) in GroupByElement has been deprecated

Check warning on line 477 in src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java

View workflow job for this annotation

GitHub Actions / Maven Verify (ubuntu-latest)

[deprecation] addGroupByExpression(Expression) in GroupByElement has been deprecated
return this;
}

Expand Down Expand Up @@ -629,10 +629,16 @@

private void appendSelectClauseTo(StringBuilder builder) {
builder.append("SELECT ");
int afterSelect = builder.length();
appendSelectHintsTo(builder);
appendSelectQualifiersTo(builder);
appendMySqlSelectModifiersTo(builder);
builder.append(getStringList(selectItems));
// PostgreSQL permits SELECT with no target expressions: keep "SELECT
// FROM" instead of doubling the space.
if (builder.length() == afterSelect) {
builder.deleteCharAt(afterSelect - 1);
}
}

private void appendSelectHintsTo(StringBuilder builder) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,13 @@ private <S> void deparseSelectClause(PlainSelect plainSelect, S context) {

plainSelect.appendMySqlSelectModifiersTo(builder);

int beforeItems = builder.length();
deparseSelectItemsClause(plainSelect.getSelectItems());
// PostgreSQL permits SELECT with no target expressions: keep "SELECT
// FROM" instead of doubling the space.
if (builder.length() == beforeItems && builder.charAt(beforeItems - 1) == ' ') {
builder.deleteCharAt(beforeItems - 1);
}

if (plainSelect.getIntoTables() != null) {
builder.append(" INTO ");
Expand Down
11 changes: 9 additions & 2 deletions src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
Original file line number Diff line number Diff line change
Expand Up @@ -8974,7 +8974,7 @@ PlainSelect PlainSelect() #PlainSelect:
}
}

[
[ LOOKAHEAD(<K_AS> (<K_STRUCT> | <K_VALUE>))
<K_AS>
(
<K_STRUCT> { plainSelect.setBigQuerySelectQualifier( PlainSelect.BigQuerySelectQualifier.AS_STRUCT ); }
Expand All @@ -8985,7 +8985,14 @@ PlainSelect PlainSelect() #PlainSelect:

[ LOOKAHEAD(2) top = Top() { plainSelect.setTop(top); } ]

selectItems=SelectItemsList()
(
// PostgreSQL allows SELECT with no target expressions.
LOOKAHEAD({ Dialect.POSTGRESQL.name().equals(getAsString(Feature.dialect))
&& getToken(1).kind == K_FROM })
{ selectItems = new ArrayList<SelectItem<?>>(); }
|
selectItems=SelectItemsList()
)

[ LOOKAHEAD(<K_INTO>)
(
Expand Down
15 changes: 15 additions & 0 deletions src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -2398,6 +2398,21 @@ public void testBooleanTestAfterPredicate() throws JSQLParserException {
assertSqlCanBeParsedAndDeparsed("SELECT * FROM t WHERE a IS TRUE IS FALSE");
}

@Test
public void testSelectWithoutTargetListPostgreSql() throws JSQLParserException {
// PostgreSQL permits SELECT with no target expressions
Statement stmt = CCJSqlParserUtil.parse(
"SELECT FROM t", parser -> parser.withDialect(Dialect.POSTGRESQL));
PlainSelect select = (PlainSelect) ((Select) stmt).getSelectBody();
assertTrue(select.getSelectItems().isEmpty());
assertDeparse(select, "SELECT FROM t");

// the reported case: empty target list inside a derived table
assertSqlCanBeParsedAndDeparsed(
"SELECT count(*) FROM (SELECT FROM (VALUES (1, 'a'), (2, 'b')) AS t(id, label)) AS q",
false, parser -> parser.withDialect(Dialect.POSTGRESQL));
}

@Test
public void testIsUnknown() throws JSQLParserException {
String statement = "SELECT col FROM tbl WHERE col IS UNKNOWN";
Expand Down
Loading