From 273726316faff88ee825b127bc28f6cc0bed0351 Mon Sep 17 00:00:00 2001
From: "clickhouse-gh[bot]"
 <173705893+clickhouse-gh[bot]@users.noreply.github.com>
Date: Wed, 12 Nov 2025 19:07:31 +0000
Subject: [PATCH 1/2] Merge pull request #89953 from
 ClickHouse/backport/25.10/89914

Backport #89914 to 25.10: Show datalake catalogs in SHOW DATABASES query
---
 src/Interpreters/InterpreterShowTablesQuery.cpp | 4 ++--
 tests/integration/test_database_glue/test.py    | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Interpreters/InterpreterShowTablesQuery.cpp b/src/Interpreters/InterpreterShowTablesQuery.cpp
index d8e01ecd722a..634fa9515f03 100644
--- 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
index 593ed38c2eb4..e5ffe67cc851 100644
--- 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()) == 4

From ed37c4ed5c01e84c6b4c2a005864a449b5b0b86f Mon Sep 17 00:00:00 2001
From: CarlosFelipeOR <carlosfelipeor@gmail.com>
Date: Tue, 13 Jan 2026 15:31:01 -0300
Subject: [PATCH 2/2] Update regression hash

---
 .github/workflows/master.yml             | 4 ++--
 .github/workflows/pull_request.yml       | 4 ++--
 ci/praktika/yaml_additional_templates.py | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index e759cc6f8aac..6e6a18da06d5 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -4178,7 +4178,7 @@ jobs:
     secrets: inherit
     with:
       runner_type: altinity-regression-tester
-      commit: c5cae9b244e0839fb307a9fb67a40fe80d93810b
+      commit: 481dd0f61ec5b22430bfc4106ac30d9abfcf70b7
       arch: x86
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout_minutes: 300
@@ -4190,7 +4190,7 @@ jobs:
     secrets: inherit
     with:
       runner_type: altinity-regression-tester-aarch64
-      commit: c5cae9b244e0839fb307a9fb67a40fe80d93810b
+      commit: 481dd0f61ec5b22430bfc4106ac30d9abfcf70b7
       arch: aarch64
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout_minutes: 300
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index f984117f649e..ff4deb6afce1 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -4134,7 +4134,7 @@ jobs:
     secrets: inherit
     with:
       runner_type: altinity-regression-tester
-      commit: c5cae9b244e0839fb307a9fb67a40fe80d93810b
+      commit: 481dd0f61ec5b22430bfc4106ac30d9abfcf70b7
       arch: x86
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout_minutes: 300
@@ -4146,7 +4146,7 @@ jobs:
     secrets: inherit
     with:
       runner_type: altinity-regression-tester-aarch64
-      commit: c5cae9b244e0839fb307a9fb67a40fe80d93810b
+      commit: 481dd0f61ec5b22430bfc4106ac30d9abfcf70b7
       arch: aarch64
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout_minutes: 300
diff --git a/ci/praktika/yaml_additional_templates.py b/ci/praktika/yaml_additional_templates.py
index e51e3b5e2724..cd1438bbb8ca 100644
--- a/ci/praktika/yaml_additional_templates.py
+++ b/ci/praktika/yaml_additional_templates.py
@@ -35,7 +35,7 @@ class AltinityWorkflowTemplates:
           echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
 """
     # Additional jobs
-    REGRESSION_HASH = f"c5cae9b244e0839fb307a9fb67a40fe80d93810b"
+    REGRESSION_HASH = f"481dd0f61ec5b22430bfc4106ac30d9abfcf70b7"
     ALTINITY_JOBS = {
         "GrypeScan": r"""
   GrypeScanServer: