Skip to content

Commit 268bfcd

Browse files
committed
MXP-2713 In case of a calculation view, the where clause is duplicated
1 parent f6bac9a commit 268bfcd

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,14 @@ protected Builder buildAggregate(Aggregate e, Builder builder,
629629
}
630630

631631
if (!isStar) {
632-
builder.setFrom(oldSelect.clone(oldSelect.getParserPosition()));
632+
SqlNode newNode = oldSelect.clone(oldSelect.getParserPosition());
633+
if ( oldSelect.getWhere() != null) builder.setWhere(null);
634+
if ( oldSelect.getHaving() != null) builder.setHaving(null);
635+
if ( oldSelect.getGroup() != null) builder.setGroupBy(null);
636+
if ( oldSelect.getFetch() != null) builder.setFetch(null);
637+
if ( oldSelect.getOffset() != null) builder.setOffset(null);
638+
if ( oldSelect.getOrderList() != null) builder.setOrderBy(null);
639+
builder.setFrom(newNode);
633640
}
634641
}
635642

0 commit comments

Comments
 (0)