[FLINK-36038][table] Output for SHOW CREATE VIEW should follow the …

…`CREATE VIEW` syntax
zhaomin1423 · Aug 13, 2024 · 2cde561 · 2cde561
1 parent e33028d
commit 2cde561
Show file tree

Hide file tree

Showing 11 changed files with 497 additions and 131 deletions.
diff --git a/flink-table/flink-sql-client/src/test/resources/sql/catalog_database.q b/flink-table/flink-sql-client/src/test/resources/sql/catalog_database.q
@@ -101,7 +101,9 @@ show create catalog cat_comment;
 +--------------------------------------------------------------------------------------------------------------------------------+
 | result |
 +--------------------------------------------------------------------------------------------------------------------------------+
-| CREATE CATALOG `cat_comment` COMMENT 'hello ''catalog''' WITH (
+| CREATE CATALOG `cat_comment`
+COMMENT 'hello ''catalog'''
+WITH (
  'default-database' = 'db',
  'type' = 'generic_in_memory'
 )
@@ -150,7 +152,8 @@ show create catalog cat2;
 +---------------------------------------------------------------------------------------------+
 | result |
 +---------------------------------------------------------------------------------------------+
-| CREATE CATALOG `cat2` WITH (
+| CREATE CATALOG `cat2`
+WITH (
  'default-database' = 'db',
  'type' = 'generic_in_memory'
 )

diff --git a/flink-table/flink-sql-client/src/test/resources/sql/table.q b/flink-table/flink-sql-client/src/test/resources/sql/table.q
@@ -90,7 +90,8 @@ show create table orders;
  `ptime` AS PROCTIME(),
  WATERMARK FOR `ts` AS `ts` - INTERVAL '1' SECOND,
  CONSTRAINT `PK_user` PRIMARY KEY (`user`) NOT ENFORCED
-) WITH (
+)
+WITH (
  'connector' = 'datagen'
 )
  |
@@ -384,7 +385,8 @@ show create table orders2;
  `ptime` AS PROCTIME(),
  WATERMARK FOR `ts` AS `ts` - INTERVAL '1' SECOND,
  CONSTRAINT `PK_user` PRIMARY KEY (`user`) NOT ENFORCED
-) WITH (
+)
+WITH (
  'connector' = 'kafka',
  'scan.startup.mode' = 'earliest-offset'
 )
@@ -411,7 +413,8 @@ show create table orders2;
  `ptime` AS PROCTIME(),
  WATERMARK FOR `ts` AS `ts` - INTERVAL '1' SECOND,
  CONSTRAINT `PK_user` PRIMARY KEY (`user`) NOT ENFORCED
-) WITH (
+)
+WITH (
  'connector' = 'datagen',
  'scan.startup.mode' = 'earliest-offset'
 )
@@ -480,7 +483,8 @@ show create table orders2;
  `ptime` AS PROCTIME(),
  WATERMARK FOR `ts` AS `ts` - INTERVAL '1' SECOND,
  CONSTRAINT `PK_user` PRIMARY KEY (`user`) NOT ENFORCED
-) WITH (
+)
+WITH (
  'connector' = 'datagen'
 )
  |
@@ -515,7 +519,8 @@ show create table orders2;
  `ptime` AS PROCTIME(),
  WATERMARK FOR `ts` AS `ts` - INTERVAL '1' SECOND,
  CONSTRAINT `PK_user` PRIMARY KEY (`user`) NOT ENFORCED
-) WITH (
+)
+WITH (
  'connector' = 'datagen'
 )
  |
@@ -560,7 +565,8 @@ show create table orders2;
  `ptime` AS PROCTIME(),
  WATERMARK FOR `ts` AS `ts` - INTERVAL '1' SECOND,
  CONSTRAINT `PK_user` PRIMARY KEY (`user`) NOT ENFORCED
-) WITH (
+)
+WITH (
  'connector' = 'datagen'
 )
  |
@@ -590,7 +596,8 @@ show create table orders2;
  `ptime` AS PROCTIME(),
  WATERMARK FOR `ts` AS `ts` - INTERVAL '1' SECOND,
  CONSTRAINT `PK_user` PRIMARY KEY (`user`) NOT ENFORCED
-) WITH (
+)
+WITH (
  'connector' = 'datagen'
 )
  |
@@ -623,7 +630,8 @@ show create table orders2;
  `ptime` AS PROCTIME(),
  WATERMARK FOR `ts` AS `ts` - INTERVAL '1' SECOND,
  CONSTRAINT `order_constraint` PRIMARY KEY (`trade_order_id`) NOT ENFORCED
-) WITH (
+)
+WITH (
  'connector' = 'datagen'
 )
  |
@@ -653,7 +661,8 @@ show create table orders2;
  `ptime` AS PROCTIME(),
  WATERMARK FOR `ts` AS `ts` - INTERVAL '1' MINUTE,
  CONSTRAINT `order_constraint` PRIMARY KEY (`trade_order_id`) NOT ENFORCED
-) WITH (
+)
+WITH (
  'connector' = 'datagen'
 )
  |
@@ -683,7 +692,8 @@ show create table orders2;
  `ptime` AS PROCTIME(),
  WATERMARK FOR `ts` AS `ts` - INTERVAL '1' MINUTE,
  CONSTRAINT `order_constraint` PRIMARY KEY (`trade_order_id`) NOT ENFORCED
-) WITH (
+)
+WITH (
  'connector' = 'datagen'
 )
  |
@@ -712,7 +722,8 @@ show create table orders2;
  `product_id` BIGINT NOT NULL,
  `ptime` AS PROCTIME(),
  WATERMARK FOR `ts` AS `ts` - INTERVAL '1' MINUTE
-) WITH (
+)
+WITH (
  'connector' = 'datagen'
 )
  |
@@ -740,7 +751,8 @@ show create table orders2;
  `user_email` VARCHAR(2147483647) NOT NULL,
  `product_id` BIGINT NOT NULL,
  `ptime` AS PROCTIME()
-) WITH (
+)
+WITH (
  'connector' = 'datagen'
 )
  |
@@ -838,7 +850,8 @@ show create table tbl1;
  `user` BIGINT NOT NULL,
  `product` VARCHAR(32),
  `amount` INT
-) WITH (
+)
+WITH (
  'connector' = 'datagen'
 )
  |
@@ -970,7 +983,8 @@ show create table orders3;
  `ptime` AS PROCTIME() COMMENT 'notice: computed column, named ''ptime''.',
  WATERMARK FOR `ts` AS `ts` - INTERVAL '1' SECOND,
  CONSTRAINT `PK_user` PRIMARY KEY (`user`) NOT ENFORCED
-) WITH (
+)
+WITH (
  'connector' = 'kafka',
  'scan.startup.mode' = 'earliest-offset'
 )

diff --git a/flink-table/flink-sql-client/src/test/resources/sql/view.q b/flink-table/flink-sql-client/src/test/resources/sql/view.q
@@ -59,25 +59,39 @@ create temporary view if not exists v2 as select * from v1;
 
 # test show create a temporary view
 show create view v1;
-+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| result |
-+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| CREATE TEMPORARY VIEW `default_catalog`.`default_database`.`v1`(`user`, `product`, `amount`, `ts`, `ptime`) as
-SELECT *
-FROM `default_catalog`.`default_database`.`orders` |
-+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| result |
++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| CREATE TEMPORARY VIEW `default_catalog`.`default_database`.`v1` (
+ `user`,
+ `product`,
+ `amount`,
+ `ts`,
+ `ptime`
+)
+AS SELECT *
+FROM `default_catalog`.`default_database`.`orders`
+ |
++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 1 row in set
 !ok
 
 # test show create a temporary view reference another view
 show create view v2;
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| result |
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| CREATE TEMPORARY VIEW `default_catalog`.`default_database`.`v2`(`user`, `product`, `amount`, `ts`, `ptime`) as
-SELECT *
-FROM `default_catalog`.`default_database`.`v1` |
-+------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| result |
++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| CREATE TEMPORARY VIEW `default_catalog`.`default_database`.`v2` (
+ `user`,
+ `product`,
+ `amount`,
+ `ts`,
+ `ptime`
+)
+AS SELECT *
+FROM `default_catalog`.`default_database`.`v1`
+ |
++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 1 row in set
 !ok
 
@@ -128,13 +142,20 @@ create view permanent_v1 as select * from orders;
 
 # test show create a permanent view
 show create view permanent_v1;
-+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| result |
-+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| CREATE VIEW `default_catalog`.`default_database`.`permanent_v1`(`user`, `product`, `amount`, `ts`, `ptime`) as
-SELECT *
-FROM `default_catalog`.`default_database`.`orders` |
-+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| result |
++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| CREATE VIEW `default_catalog`.`default_database`.`permanent_v1` (
+ `user`,
+ `product`,
+ `amount`,
+ `ts`,
+ `ptime`
+)
+AS SELECT *
+FROM `default_catalog`.`default_database`.`orders`
+ |
++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 1 row in set
 !ok
 

diff --git a/flink-table/flink-sql-gateway/src/test/resources/sql/catalog_database.q b/flink-table/flink-sql-gateway/src/test/resources/sql/catalog_database.q
@@ -121,7 +121,9 @@ create catalog cat_comment comment 'hello ''catalog''' WITH ('type'='generic_in_
 
 show create catalog cat_comment;
 !output
-CREATE CATALOG `cat_comment` COMMENT 'hello ''catalog''' WITH (
+CREATE CATALOG `cat_comment`
+COMMENT 'hello ''catalog'''
+WITH (
  'default-database' = 'db',
  'type' = 'generic_in_memory'
 )
@@ -179,7 +181,8 @@ create catalog cat2 WITH ('type'='generic_in_memory', 'default-database'='db');
 
 show create catalog cat2;
 !output
-CREATE CATALOG `cat2` WITH (
+CREATE CATALOG `cat2`
+WITH (
  'default-database' = 'db',
  'type' = 'generic_in_memory'
 )

diff --git a/flink-table/flink-sql-gateway/src/test/resources/sql/table.q b/flink-table/flink-sql-gateway/src/test/resources/sql/table.q
@@ -91,7 +91,8 @@ CREATE TABLE `default_catalog`.`default_database`.`orders` (
  `ptime` AS PROCTIME(),
  WATERMARK FOR `ts` AS `ts` - INTERVAL '1' SECOND,
  CONSTRAINT `PK_user` PRIMARY KEY (`user`) NOT ENFORCED
-) WITH (
+)
+WITH (
  'connector' = 'datagen'
 )
 !ok
@@ -341,7 +342,8 @@ CREATE TABLE `default_catalog`.`default_database`.`orders2` (
  `ptime` AS PROCTIME(),
  WATERMARK FOR `ts` AS `ts` - INTERVAL '1' SECOND,
  CONSTRAINT `PK_user` PRIMARY KEY (`user`) NOT ENFORCED
-) WITH (
+)
+WITH (
  'connector' = 'kafka',
  'scan.startup.mode' = 'earliest-offset'
 )
@@ -369,7 +371,8 @@ CREATE TABLE `default_catalog`.`default_database`.`orders2` (
  `ptime` AS PROCTIME(),
  WATERMARK FOR `ts` AS `ts` - INTERVAL '1' SECOND,
  CONSTRAINT `PK_user` PRIMARY KEY (`user`) NOT ENFORCED
-) WITH (
+)
+WITH (
  'connector' = 'datagen',
  'scan.startup.mode' = 'earliest-offset'
 )
@@ -439,7 +442,8 @@ CREATE TABLE `default_catalog`.`default_database`.`orders2` (
  `ptime` AS PROCTIME(),
  WATERMARK FOR `ts` AS `ts` - INTERVAL '1' SECOND,
  CONSTRAINT `PK_user` PRIMARY KEY (`user`) NOT ENFORCED
-) WITH (
+)
+WITH (
  'connector' = 'datagen'
 )
 !ok
@@ -558,7 +562,8 @@ CREATE TEMPORARY TABLE `default_catalog`.`default_database`.`tbl1` (
  `user` BIGINT NOT NULL,
  `product` VARCHAR(32),
  `amount` INT
-) WITH (
+)
+WITH (
  'connector' = 'datagen'
 )
 !ok

diff --git a/flink-table/flink-sql-gateway/src/test/resources/sql/view.q b/flink-table/flink-sql-gateway/src/test/resources/sql/view.q
@@ -84,16 +84,28 @@ create temporary view if not exists v2 as select * from v1;
 # test show create a temporary view
 show create view v1;
 !output
-CREATE TEMPORARY VIEW `default_catalog`.`default_database`.`v1`(`user`, `product`, `amount`, `ts`, `ptime`) as
-SELECT *
+CREATE TEMPORARY VIEW `default_catalog`.`default_database`.`v1` (
+ `user`,
+ `product`,
+ `amount`,
+ `ts`,
+ `ptime`
+)
+AS SELECT *
 FROM `default_catalog`.`default_database`.`orders`
 !ok
 
 # test show create a temporary view reference another view
 show create view v2;
 !output
-CREATE TEMPORARY VIEW `default_catalog`.`default_database`.`v2`(`user`, `product`, `amount`, `ts`, `ptime`) as
-SELECT *
+CREATE TEMPORARY VIEW `default_catalog`.`default_database`.`v2` (
+ `user`,
+ `product`,
+ `amount`,
+ `ts`,
+ `ptime`
+)
+AS SELECT *
 FROM `default_catalog`.`default_database`.`v1`
 !ok
 
@@ -159,8 +171,14 @@ create view permanent_v1 as select * from orders;
 # test show create a permanent view
 show create view permanent_v1;
 !output
-CREATE VIEW `default_catalog`.`default_database`.`permanent_v1`(`user`, `product`, `amount`, `ts`, `ptime`) as
-SELECT *
+CREATE VIEW `default_catalog`.`default_database`.`permanent_v1` (
+ `user`,
+ `product`,
+ `amount`,
+ `ts`,
+ `ptime`
+)
+AS SELECT *
 FROM `default_catalog`.`default_database`.`orders`
 !ok