Skip to content

Commit a2f40dd

Browse files
fix: AllColumns replace takes expressions
Signed-off-by: Andreas Reichel <[email protected]>
1 parent 47583de commit a2f40dd

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/main/java/net/sf/jsqlparser/statement/select/AllColumns.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@
2020

2121
public class AllColumns extends ASTNodeAccessImpl implements Expression {
2222
protected ExpressionList<Column> exceptColumns;
23-
protected List<SelectItem<Column>> replaceExpressions;
23+
protected List<SelectItem<?>> replaceExpressions;
2424
private String exceptKeyword;
2525

2626
public AllColumns(ExpressionList<Column> exceptColumns,
27-
List<SelectItem<Column>> replaceExpressions) {
27+
List<SelectItem<?>> replaceExpressions) {
2828
this.exceptColumns = exceptColumns;
2929
this.replaceExpressions = replaceExpressions;
3030
this.exceptKeyword = exceptColumns != null ? "Except" : null;
3131
}
3232

3333
public AllColumns(ExpressionList<Column> exceptColumns,
34-
List<SelectItem<Column>> replaceExpressions, String exceptKeyword) {
34+
List<SelectItem<?>> replaceExpressions, String exceptKeyword) {
3535
this.exceptColumns = exceptColumns;
3636
this.replaceExpressions = replaceExpressions;
3737
this.exceptKeyword = exceptKeyword;
@@ -58,16 +58,16 @@ public ExpressionList<Column> addExceptColumn(Column column) {
5858
return exceptColumns;
5959
}
6060

61-
public List<SelectItem<Column>> getReplaceExpressions() {
61+
public List<SelectItem<?>> getReplaceExpressions() {
6262
return replaceExpressions;
6363
}
6464

65-
public AllColumns setReplaceExpressions(List<SelectItem<Column>> replaceExpressions) {
65+
public AllColumns setReplaceExpressions(List<SelectItem<?>> replaceExpressions) {
6666
this.replaceExpressions = replaceExpressions;
6767
return this;
6868
}
6969

70-
public List<SelectItem<Column>> addReplaceExpression(SelectItem<Column> selectItem) {
70+
public List<SelectItem<?>> addReplaceExpression(SelectItem<?> selectItem) {
7171
if (replaceExpressions == null) {
7272
replaceExpressions = new ArrayList<>();
7373
}

src/main/java/net/sf/jsqlparser/statement/select/AllTableColumns.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ public class AllTableColumns extends AllColumns {
2121
private Table table;
2222

2323
public AllTableColumns(Table table, ExpressionList<Column> exceptColumns,
24-
List<SelectItem<Column>> replaceExpressions, String exceptKeyword) {
24+
List<SelectItem<?>> replaceExpressions, String exceptKeyword) {
2525
super(exceptColumns, replaceExpressions, exceptKeyword);
2626
this.table = table;
2727
}
2828

2929
public AllTableColumns(Table table, ExpressionList<Column> exceptColumns,
30-
List<SelectItem<Column>> replaceExpressions) {
30+
List<SelectItem<?>> replaceExpressions) {
3131
this(table, exceptColumns, replaceExpressions, "EXCEPT");
3232
}
3333

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3189,14 +3189,14 @@ SelectItem<?> SelectItem() #SelectItem:
31893189
AllColumns AllColumns():
31903190
{
31913191
ParenthesedExpressionList<Column> exceptColumns = null;
3192-
List<SelectItem<Column>> replaceExpressions = null;
3192+
List<SelectItem<?>> replaceExpressions = null;
31933193
String exceptKeyword=null;
31943194
Token tk;
31953195
}
31963196
{
31973197
"*"
31983198
[ LOOKAHEAD(2) ( tk=<K_EXCEPT> | tk=<K_EXCLUDE> ) exceptColumns = ParenthesedColumnList() { exceptKeyword=tk.image; } ]
3199-
[ LOOKAHEAD(2) <K_REPLACE> "(" replaceExpressions = ColumnSelectItemsList() ")" ]
3199+
[ LOOKAHEAD(2) <K_REPLACE> "(" replaceExpressions = SelectItemsList() ")" ]
32003200

32013201
{
32023202
return new AllColumns(exceptColumns, replaceExpressions, exceptKeyword);

0 commit comments

Comments
 (0)