Skip to content

[CALCITE-7681] SqlDatetimeSubtractionOperator drops parentheses around compound interval expressions #5135

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

Draft
matthewbayer wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[CALCITE-7681] SqlDatetimeSubtractionOperator drops parentheses around compound interval expressions #5135

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
4 changes: 2 additions & 2 deletions core/src/main/java/org/apache/calcite/sql/SqlDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,9 +496,9 @@ public void unparseNumericLiteral(SqlWriter writer,
public void unparseSqlDatetimeArithmetic(SqlWriter writer,
SqlCall call, SqlKind sqlKind, int leftPrec, int rightPrec) {
final SqlWriter.Frame frame = writer.startList("(", ")");
call.operand(0).unparse(writer, leftPrec, rightPrec);
call.operand(0).unparse(writer, leftPrec, call.getOperator().getLeftPrec());
writer.sep((SqlKind.PLUS == sqlKind) ? "+" : "-");
call.operand(1).unparse(writer, leftPrec, rightPrec);
call.operand(1).unparse(writer, call.getOperator().getRightPrec(), rightPrec);
writer.endList(frame);
// Only two parameters are present normally.
// Checking parameter count to prevent errors.
Expand Down
14 changes: 14 additions & 0 deletions core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,20 @@ private static String toSql(RelNode root, SqlDialect dialect,
.withOracle().ok(expectedOracle);
}

@Test void testDatetimeSubtractionWithCompoundInterval() {
final String query = "select CURRENT_DATE"
+ " - (INTERVAL '3' YEAR + INTERVAL '3' YEAR) as d";
final String expected = "SELECT (CURRENT_DATE"
+ " - (INTERVAL '3' YEAR + INTERVAL '3' YEAR)) AS \"D\"\n"
+ "FROM (VALUES (0)) AS \"t\" (\"ZERO\")";
final String expectedSpark = "SELECT (CURRENT_DATE"
+ " - (INTERVAL '3' YEAR + INTERVAL '3' YEAR)) `D`\n"
+ "FROM (VALUES (0)) `t` (`ZERO`)";
sql(query)
.ok(expected)
.withSpark().ok(expectedSpark);
}

@Test void testPivotToSqlFromProductTable() {
String query = "select * from (\n"
+ " select \"shelf_width\", \"net_weight\", \"product_id\"\n"
Expand Down