Backport #89914 to 25.10: Show datalake catalogs in SHOW DATABASES query

robot-clickhouse · robot-clickhouse · commit 3ef5fb5ecefa · 2025-11-12T17:13:51.000Z
diff --git a/src/Interpreters/InterpreterShowTablesQuery.cpp b/src/Interpreters/InterpreterShowTablesQuery.cpp
@@ -232,10 +232,10 @@ BlockIO InterpreterShowTablesQuery::execute()
     }
     auto rewritten_query = getRewrittenQuery();
     String database = getContext()->resolveDatabase(query.getFrom());
-    if (DatabaseCatalog::instance().isDatalakeCatalog(database))
+    if (query.databases || DatabaseCatalog::instance().isDatalakeCatalog(database))
     {
         auto context_copy = Context::createCopy(getContext());
-        /// HACK To always show them in explicit "SHOW TABLES" queries
+        /// HACK To always show them in explicit "SHOW TABLES" and "SHOW DATABASES" queries
         context_copy->setSetting("show_data_lake_catalogs_in_system_tables", true);
         return executeQuery(rewritten_query, context_copy, QueryFlags{ .internal = true }).second;
     }
diff --git a/tests/integration/test_database_glue/test.py b/tests/integration/test_database_glue/test.py
@@ -617,6 +617,8 @@ def test_system_tables(started_cluster):
             node.query(f"SELECT count() FROM {CATALOG_NAME}.`{namespace}.{table_name}`")
         )
 
+    assert CATALOG_NAME in node.query("SHOW DATABASES")
+    assert table_name in node.query(f"SHOW TABLES FROM {CATALOG_NAME}")
     # system.tables
     assert int(node.query(f"SELECT count() FROM system.tables WHERE database = '{CATALOG_NAME}' and table ilike '%{root_namespace}%' SETTINGS show_data_lake_catalogs_in_system_tables = true").strip()) == 4
     assert int(node.query(f"SELECT count() FROM system.tables WHERE database = '{CATALOG_NAME}' and table ilike '%{root_namespace}%'").strip()) == 0

Original file line number	Diff line number	Diff line change
`@@ -232,10 +232,10 @@ BlockIO InterpreterShowTablesQuery::execute()`
`232`	`232`	`}`
`233`	`233`	`auto rewritten_query = getRewrittenQuery();`
`234`	`234`	`String database = getContext()->resolveDatabase(query.getFrom());`
`235`		`- if (DatabaseCatalog::instance().isDatalakeCatalog(database))`
	`235`	`+ if (query.databases \|\| DatabaseCatalog::instance().isDatalakeCatalog(database))`
`236`	`236`	`{`
`237`	`237`	`auto context_copy = Context::createCopy(getContext());`
`238`		`- /// HACK To always show them in explicit "SHOW TABLES" queries`
	`238`	`+ /// HACK To always show them in explicit "SHOW TABLES" and "SHOW DATABASES" queries`
`239`	`239`	`context_copy->setSetting("show_data_lake_catalogs_in_system_tables", true);`
`240`	`240`	`return executeQuery(rewritten_query, context_copy, QueryFlags{ .internal = true }).second;`
`241`	`241`	`}`
Original file line number	Diff line number	Diff line change
`@@ -617,6 +617,8 @@ def test_system_tables(started_cluster):`
`617`	`617`	node.query(f"SELECT count() FROM {CATALOG_NAME}.`{namespace}.{table_name}`")
`618`	`618`	`)`
`619`	`619`
	`620`	`+ assert CATALOG_NAME in node.query("SHOW DATABASES")`
	`621`	`+ assert table_name in node.query(f"SHOW TABLES FROM {CATALOG_NAME}")`
`620`	`622`	`# system.tables`
`621`	`623`	`assert int(node.query(f"SELECT count() FROM system.tables WHERE database = '{CATALOG_NAME}' and table ilike '%{root_namespace}%' SETTINGS show_data_lake_catalogs_in_system_tables = true").strip()) == 4`
`622`	`624`	`assert int(node.query(f"SELECT count() FROM system.tables WHERE database = '{CATALOG_NAME}' and table ilike '%{root_namespace}%'").strip()) == 0`