feat: show full databases add owner field (databendlabs#14184)

* feat: show databases add owner field * fix test case * fix test case 2 * fix test case 3 * owner field only in show full databases * fix comment --------- Co-authored-by: Bohu <[email protected]> Co-authored-by: TCeason <[email protected]>
guojidan · Jan 3, 2024 · e420583 · e420583
1 parent 61c8181
commit e420583
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/query/service/tests/it/servers/http/http_query_handlers.rs b/src/query/service/tests/it/servers/http/http_query_handlers.rs
@@ -344,8 +344,8 @@ async fn test_show_databases() -> Result<()> {
     let (status, result) = post_sql(sql, 1).await?;
     assert_eq!(status, StatusCode::OK, "{:?}", result);
     assert!(result.error.is_none(), "{:?}", result);
-    // has two fields: catalog, name
-    assert_eq!(result.schema.len(), 2, "{:?}", result);
+    // has three fields: catalog, owner, name
+    assert_eq!(result.schema.len(), 3, "{:?}", result);
 
     Ok(())
 }

diff --git a/src/query/sql/src/planner/binder/ddl/database.rs b/src/query/sql/src/planner/binder/ddl/database.rs
@@ -70,6 +70,7 @@ impl Binder {
 
         if *full {
             select_builder.with_column("catalog AS Catalog");
+            select_builder.with_column("owner");
         }
         select_builder.with_column(format!("name AS `databases_in_{ctl}`"));
         select_builder.with_order_by("catalog");

diff --git a/tests/sqllogictests/suites/base/06_show/06_0000_show_databases.test b/tests/sqllogictests/suites/base/06_show/06_0000_show_databases.test
@@ -26,16 +26,16 @@ ss2
 query TT
 SHOW FULL DATABASES like 'ss%';
 ----
-default ss
-default ss1
-default ss2
+default account_admin ss
+default account_admin ss1
+default account_admin ss2
 
 query TT
 SHOW FULL DATABASES FROM default like 'ss%';
 ----
-default ss
-default ss1
-default ss2
+default account_admin ss
+default account_admin ss1
+default account_admin ss2
 
 query T
 SHOW SCHEMAS like 'ss%'