From 2caa016875dfcf827cc345dbc13f31980f006842 Mon Sep 17 00:00:00 2001 From: Elazar Lachkar Date: Wed, 27 May 2026 10:36:51 +0300 Subject: [PATCH 1/2] fix: add explicit sqlserver__ dispatches in elementary_cli (CORE-877) dbt-sqlserver no longer includes fabric in its adapter dispatch chain, so fabric__ macros in elementary_cli are not picked up for sqlserver targets. Add sqlserver__ delegates for get_test_results and get_adapter_unique_id. Co-authored-by: Cursor --- .../dbt_project/macros/get_adapter_type_and_unique_id.sql | 4 ++++ elementary/monitor/dbt_project/macros/get_test_results.sql | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/elementary/monitor/dbt_project/macros/get_adapter_type_and_unique_id.sql b/elementary/monitor/dbt_project/macros/get_adapter_type_and_unique_id.sql index 4f56ee88c..d90ab6262 100644 --- a/elementary/monitor/dbt_project/macros/get_adapter_type_and_unique_id.sql +++ b/elementary/monitor/dbt_project/macros/get_adapter_type_and_unique_id.sql @@ -26,6 +26,10 @@ {{ return(target.server) }} {% endmacro %} +{% macro sqlserver__get_adapter_unique_id() %} + {{ return(target.server) }} +{% endmacro %} + {% macro fabricspark__get_adapter_unique_id() %} {{ return(target.workspaceid) }} {% endmacro %} diff --git a/elementary/monitor/dbt_project/macros/get_test_results.sql b/elementary/monitor/dbt_project/macros/get_test_results.sql index bc6a34629..f9efa38ab 100644 --- a/elementary/monitor/dbt_project/macros/get_test_results.sql +++ b/elementary/monitor/dbt_project/macros/get_test_results.sql @@ -129,8 +129,7 @@ current_tests_run_results_query already starts with WITH, so we cannot wrap it in another CTE. Instead we materialise it into a temp table first, then build ordered_test_results on top. - Note: sqlserver adapter inherits from fabric, so this dispatch - covers both fabric and sqlserver targets automatically. + sqlserver targets use sqlserver__get_test_results (delegates here). #} {% set elementary_tests_allowlist_status = ['fail', 'warn'] if disable_passed_test_metrics else ['fail', 'warn', 'pass'] %} @@ -182,6 +181,10 @@ {% do return(elementary_cli._process_raw_test_results(test_results_agate, test_result_rows_agate, elementary_tests_allowlist_status, skip_test_result_rows)) %} {%- endmacro -%} +{%- macro sqlserver__get_test_results(days_back = 7, invocations_per_test = 720, disable_passed_test_metrics = false, skip_test_result_rows = false) -%} + {% do return(elementary_cli.fabric__get_test_results(days_back, invocations_per_test, disable_passed_test_metrics, skip_test_result_rows)) %} +{%- endmacro -%} + {%- macro clickhouse__get_test_results(days_back = 7, invocations_per_test = 720, disable_passed_test_metrics = false, skip_test_result_rows = false) -%} {% set elementary_tests_allowlist_status = ['fail', 'warn'] if disable_passed_test_metrics else ['fail', 'warn', 'pass'] %} {% do elementary.run_query('drop table if exists ordered_test_results') %} From ee6304ddb67dfa04af0d164da1b5087912a30986 Mon Sep 17 00:00:00 2001 From: Elazar Lachkar Date: Wed, 27 May 2026 11:38:03 +0300 Subject: [PATCH 2/2] chore: remove redundant sqlserver dispatch comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Address review feedback — the explicit sqlserver__ macro makes the delegation path self-evident. Co-authored-by: Cursor --- elementary/monitor/dbt_project/macros/get_test_results.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/elementary/monitor/dbt_project/macros/get_test_results.sql b/elementary/monitor/dbt_project/macros/get_test_results.sql index f9efa38ab..fffd413e7 100644 --- a/elementary/monitor/dbt_project/macros/get_test_results.sql +++ b/elementary/monitor/dbt_project/macros/get_test_results.sql @@ -129,7 +129,6 @@ current_tests_run_results_query already starts with WITH, so we cannot wrap it in another CTE. Instead we materialise it into a temp table first, then build ordered_test_results on top. - sqlserver targets use sqlserver__get_test_results (delegates here). #} {% set elementary_tests_allowlist_status = ['fail', 'warn'] if disable_passed_test_metrics else ['fail', 'warn', 'pass'] %}