Skip to content
Open
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 @@ -9,15 +9,14 @@
*/
package net.sf.jsqlparser.statement.select;

import java.util.ArrayList;
import java.util.List;
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.ExpressionVisitor;
import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
import net.sf.jsqlparser.schema.Column;

import java.util.ArrayList;
import java.util.List;

public class AllColumns extends ASTNodeAccessImpl implements Expression {
protected ExpressionList<Column> exceptColumns;
protected List<SelectItem<?>> replaceExpressions;
Expand Down Expand Up @@ -87,7 +86,8 @@ public AllColumns setExceptKeyword(String exceptKeyword) {
public StringBuilder appendTo(StringBuilder builder) {
builder.append("*");
if (exceptColumns != null && !exceptColumns.isEmpty()) {
builder.append(" ").append(exceptKeyword).append("( ");
builder.append(" ").append(exceptKeyword == null ? "EXCEPT" : exceptKeyword)
.append("( ");
exceptColumns.appendTo(builder);
builder.append(" )");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,15 @@
*/
package net.sf.jsqlparser.statement.select;

import static net.sf.jsqlparser.test.TestUtils.assertDeparse;
import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
import static org.junit.jupiter.api.Assertions.assertEquals;

import net.sf.jsqlparser.JSQLParserException;
import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
import net.sf.jsqlparser.schema.Column;
import net.sf.jsqlparser.schema.Table;
import net.sf.jsqlparser.test.TestUtils;
import org.junit.jupiter.api.Test;

Expand All @@ -31,4 +39,52 @@ void testDuckDBQuerySyntax() throws JSQLParserException {
+ "FROM orders";
TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
}

@Test
void addExceptColumnToNewWildcard() throws JSQLParserException {
AllColumns columns = new AllColumns();
columns.addExceptColumn(new Column("hidden"));
PlainSelect select = new PlainSelect().addSelectItem(columns).withFromItem(new Table("t"));

String expected = "SELECT * EXCEPT( hidden ) FROM t";
assertEquals(expected, select.toString());
assertDeparse(select, expected);
assertSqlCanBeParsedAndDeparsed(expected);
}

@Test
void setExceptColumnsOnParsedWildcard() throws JSQLParserException {
PlainSelect select = (PlainSelect) CCJSqlParserUtil.parse("SELECT * FROM t");
AllColumns columns = select.getSelectItem(0).getExpression(AllColumns.class);
columns.setExceptColumns(new ExpressionList<>(new Column("hidden")));

String expected = "SELECT * EXCEPT( hidden ) FROM t";
assertEquals(expected, select.toString());
assertDeparse(select, expected);
assertSqlCanBeParsedAndDeparsed(expected);
}

@Test
void addExceptColumnToParsedTableWildcard() throws JSQLParserException {
PlainSelect select = (PlainSelect) CCJSqlParserUtil.parse("SELECT t.* FROM t");
AllTableColumns columns = select.getSelectItem(0).getExpression(AllTableColumns.class);
columns.addExceptColumn(new Column("hidden"));

String expected = "SELECT t.* EXCEPT( hidden ) FROM t";
assertEquals(expected, select.toString());
assertDeparse(select, expected);
assertSqlCanBeParsedAndDeparsed(expected);
}

@Test
void preserveExplicitExceptKeywordAndEmptyColumns() {
AllColumns columns = new AllColumns().setExceptKeyword("EXCLUDE");
columns.addExceptColumn(new Column("hidden"));
assertEquals("* EXCLUDE( hidden )", columns.toString());

columns.setExceptColumns(new ExpressionList<>());
assertEquals("*", columns.toString());
columns.setExceptColumns(null);
assertEquals("*", columns.toString());
}
}
Loading