feat: Enhance show views (#15109)

* show full views add column view_query

* remove unused import

* fix test case

* fix review & test case

* fix test case

Author: blackstar-baba

src/query/service/tests/it/servers/http/http_query_handlers.rs

@@ -278,7 +278,7 @@ async fn test_simple_sql() -> Result<()> {
     assert_eq!(result.state, ExecuteStateKind::Succeeded, "{:?}", result);
     assert_eq!(result.next_uri, Some(final_uri.clone()), "{:?}", result);
     assert_eq!(result.data.len(), 10, "{:?}", result);
-    assert_eq!(result.schema.len(), 19, "{:?}", result);
+    assert_eq!(result.schema.len(), 20, "{:?}", result);
 
     // get state
     let uri = make_state_uri(query_id);

src/query/service/tests/it/storages/testdata/columns_table.txt

@@ -430,6 +430,8 @@ DB.Table: 'system'.'columns', Table: columns-table_id:1, ver:0, Engine: SystemCo
 | 'version'                         | 'system'             | 'clusters'             | 'String'              | 'VARCHAR'           | ''       | ''       | 'NO'     | ''       |
 | 'version'                         | 'system'             | 'credits'              | 'String'              | 'VARCHAR'           | ''       | ''       | 'NO'     | ''       |
 | 'view_definition'                 | 'information_schema' | 'views'                | 'NULL'                | 'NULL'              | ''       | ''       | 'NO'     | ''       |
+| 'view_query'                      | 'system'             | 'tables'               | 'String'              | 'VARCHAR'           | ''       | ''       | 'NO'     | ''       |
+| 'view_query'                      | 'system'             | 'tables_with_history'  | 'String'              | 'VARCHAR'           | ''       | ''       | 'NO'     | ''       |
 | 'virtual_columns'                 | 'system'             | 'virtual_columns'      | 'String'              | 'VARCHAR'           | ''       | ''       | 'NO'     | ''       |
 | 'wait_time'                       | 'system'             | 'queries_queue'        | 'UInt64'              | 'BIGINT UNSIGNED'   | ''       | ''       | 'NO'     | ''       |
 | 'warehouse'                       | 'system'             | 'task_history'         | 'Nullable(String)'    | 'VARCHAR'           | ''       | ''       | 'YES'    | ''       |

src/query/sql/src/planner/binder/ddl/view.rs

@@ -188,6 +188,8 @@ impl Binder {
             };
         }
 
+        select_builder.with_column("view_query");
+
         select_builder
             .with_order_by("catalog")
             .with_order_by("database")

src/query/storages/system/src/tables_table.rs

@@ -36,6 +36,7 @@ use databend_common_meta_app::principal::OwnershipObject;
 use databend_common_meta_app::schema::TableIdent;
 use databend_common_meta_app::schema::TableInfo;
 use databend_common_meta_app::schema::TableMeta;
+use databend_common_storages_view::view_table::QUERY;
 use databend_common_users::GrantObjectVisibilityChecker;
 use databend_common_users::UserApiProvider;
 use log::warn;
@@ -164,6 +165,7 @@ where TablesTable<T>: HistoryAware
                 TableDataType::Nullable(Box::new(TableDataType::String)),
             ),
             TableField::new("comment", TableDataType::String),
+            TableField::new("view_query", TableDataType::String),
         ])
     }
 
@@ -387,6 +389,23 @@ where TablesTable<T>: HistoryAware
             .map(|v| v.get_table_info().meta.comment.clone())
             .collect();
 
+        let view_query: Vec<String> = database_tables
+            .iter()
+            .map(|v| -> String {
+                let tbl_info = v.get_table_info();
+                match tbl_info.engine() {
+                    "VIEW" => {
+                        let query = tbl_info.options().get(QUERY);
+                        match query {
+                            Some(query) => query.clone(),
+                            None => String::from(""),
+                        }
+                    }
+                    _ => String::from(""),
+                }
+            })
+            .collect();
+
         DataBlock::new_from_columns(vec![
             StringType::from_data(catalogs),
             StringType::from_data(databases),
@@ -407,6 +426,7 @@ where TablesTable<T>: HistoryAware
             UInt64Type::from_opt_data(number_of_blocks),
             StringType::from_opt_data(owner),
             StringType::from_data(comment),
+            StringType::from_data(view_query),
         ])
     }
 

tests/sqllogictests/suites/base/06_show/06_0023_show_views.test

@@ -29,46 +29,46 @@ use showview
 query T
 SHOW VIEWS
 ----
-v1
-v2
-v3
+v1 SELECT * FROM showview.t1
+v2 SELECT * FROM showview.t2
+v3 SELECT * FROM showview.t3
 
 query T
 SHOW VIEWS LIKE 'v%'
 ----
-v1
-v2
-v3
+v1 SELECT * FROM showview.t1
+v2 SELECT * FROM showview.t2
+v3 SELECT * FROM showview.t3
 
 query T
 SHOW VIEWS LIKE 'v2'
 ----
-v2
+v2 SELECT * FROM showview.t2
 
 statement ok
 SHOW VIEWS LIKE 'v'
 
 query T
 SHOW VIEWS WHERE name LIKE 'v%'
 ----
-v1
-v2
-v3
+v1 SELECT * FROM showview.t1
+v2 SELECT * FROM showview.t2
+v3 SELECT * FROM showview.t3
 
 statement ok
 SHOW VIEWS WHERE name = 'v%' AND 1 = 0
 
 query T
 SHOW VIEWS WHERE name = 'v2' OR 1 = 1
 ----
-v1
-v2
-v3
+v1 SELECT * FROM showview.t1
+v2 SELECT * FROM showview.t2
+v3 SELECT * FROM showview.t3
 
 query T
 SHOW VIEWS WHERE name = 'v2' AND 1 = 1
 ----
-v2
+v2 SELECT * FROM showview.t2
 
 statement ok
 USE default