Skip to content

Antalya 25.8 Backport of #89914: Show datalake catalogs in SHOW DATABASES query #1283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zvonand merged 3 commits into from
Jan 14, 2026
+9 −7
Merged

Antalya 25.8 Backport of #89914: Show datalake catalogs in SHOW DATABASES query #1283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2737263
Merge pull request #89953 from ClickHouse/backport/25.10/89914
clickhouse-gh[bot] Nov 12, 2025
12f06eb
Merge branch 'antalya-25.8' into backports/antalya-25.8/89914
CarlosFelipeOR Jan 13, 2026
ed37c4e
Update regression hash
CarlosFelipeOR Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/praktika/yaml_additional_templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions src/Interpreters/InterpreterShowTablesQuery.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/test_database_glue/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading