Skip to content

[FLINK-22654][table] fix SqlCreateTable toString()/unparse() lose CONSTRAINTS and watermarks #15918

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

Merged
godfreyhe merged 1 commit into from
May 17, 2021
Merged

[FLINK-22654][table] fix SqlCreateTable toString()/unparse() lose CONSTRAINTS and watermarks #15918

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
2 changes: 1 addition & 1 deletion ...-table/flink-sql-parser/src/main/java/org/apache/flink/sql/parser/ddl/SqlCreateTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ public void unparse(SqlWriter writer, int leftPrec, int rightPrec) {
writer.keyword("IF NOT EXISTS");
}
tableName.unparse(writer, leftPrec, rightPrec);
if (columnList.size() > 0) {
if (columnList.size() > 0 || tableConstraints.size() > 0 || watermark != null) {
SqlWriter.Frame frame =
writer.startList(SqlWriter.FrameTypeEnum.create("sds"), "(", ")");
for (SqlNode column : columnList) {
Expand Down
48 changes: 48 additions & 0 deletions ...le/flink-sql-parser/src/test/java/org/apache/flink/sql/parser/FlinkSqlParserImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,35 @@ public void testCreateTableWithLikeClause() {
sql(sql).ok(expected);
}

@Test
public void testCreateTableWithLikeClauseWithoutColumns() {
final String sql =
""
+ "create TEMPORARY table source_table (\n"
+ " WATERMARK FOR ts AS ts - INTERVAL '5' SECOND\n"
+ ") with (\n"
+ " 'scan.startup.mode' = 'specific-offsets',\n"
+ " 'scan.startup.specific-offsets' = 'partition:0,offset:1169129'\n"
+ ") like t_order_course (\n"
+ " OVERWRITING WATERMARKS\n"
+ " OVERWRITING OPTIONS\n"
+ " EXCLUDING CONSTRAINTS\n"
+ ")";
final String expected =
"CREATE TEMPORARY TABLE `SOURCE_TABLE` (\n"
+ " WATERMARK FOR `TS` AS (`TS` - INTERVAL '5' SECOND)\n"
+ ") WITH (\n"
+ " 'scan.startup.mode' = 'specific-offsets',\n"
+ " 'scan.startup.specific-offsets' = 'partition:0,offset:1169129'\n"
+ ")\n"
+ "LIKE `T_ORDER_COURSE` (\n"
+ " OVERWRITING WATERMARKS\n"
+ " OVERWRITING OPTIONS\n"
+ " EXCLUDING CONSTRAINTS\n"
+ ")";
sql(sql).ok(expected);
}

@Test
public void testCreateTemporaryTable() {
final String sql =
Expand Down Expand Up @@ -851,6 +880,25 @@ public void testCreateTableWithNoColumns() {
sql(sql).ok(expected);
}

@Test
public void testCreateTableWithOnlyWaterMark() {
final String sql =
"create table source_table (\n"
+ " watermark FOR ts AS ts - interval '3' second\n"
+ ") with (\n"
+ " 'x' = 'y',\n"
+ " 'abc' = 'def'\n"
+ ")";
final String expected =
"CREATE TABLE `SOURCE_TABLE` (\n"
+ " WATERMARK FOR `TS` AS (`TS` - INTERVAL '3' SECOND)\n"
+ ") WITH (\n"
+ " 'x' = 'y',\n"
+ " 'abc' = 'def'\n"
+ ")";
sql(sql).ok(expected);
}

@Test
public void testDropTable() {
final String sql = "DROP table catalog1.db1.tbl1";
Expand Down