Skip to content

fix: guard Fusion's None target.threads and empty failures in all adapter overrides #569

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

Open
mbiyashev3 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: guard Fusion's None target.threads and empty failures in all adapter overrides #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df0e7d6
fix: guard None target.threads in all adapter invocations overrides
mbiyashev3 Aug 18, 2026
337099c
fix: guard empty-string failures in all adapter test_executions overr…
mbiyashev3 Aug 18, 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
12 changes: 8 additions & 4 deletions macros/upload_individual_datasets/upload_invocations.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@
'{{ target.profile_name }}', {# target_profile_name #}
'{{ target.name }}', {# target_name #}
'{{ target.schema }}', {# target_schema #}
{{ target.threads }}, {# target_threads #}
{# dbt-fusion sets target.threads to None — guard against it #}
{% if target.threads is not none %}{{ target.threads }}{% else %}null{% endif %}, {# target_threads #}

'{{ env_var('DBT_CLOUD_PROJECT_ID', '') }}', {# dbt_cloud_project_id #}
'{{ env_var('DBT_CLOUD_JOB_ID', '') }}', {# dbt_cloud_job_id #}
Expand Down Expand Up @@ -172,7 +173,8 @@
'{{ target.profile_name }}', {# target_profile_name #}
'{{ target.name }}', {# target_name #}
'{{ target.schema }}', {# target_schema #}
{{ target.threads }}, {# target_threads #}
{# dbt-fusion sets target.threads to None — guard against it #}
{% if target.threads is not none %}{{ target.threads }}{% else %}null{% endif %}, {# target_threads #}

'{{ env_var("DBT_CLOUD_PROJECT_ID", "") }}', {# dbt_cloud_project_id #}
'{{ env_var("DBT_CLOUD_JOB_ID", "") }}', {# dbt_cloud_job_id #}
Expand Down Expand Up @@ -234,7 +236,8 @@
'{{ target.profile_name }}', {# target_profile_name #}
'{{ target.name }}', {# target_name #}
'{{ target.schema }}', {# target_schema #}
{{ target.threads }}, {# target_threads #}
{# dbt-fusion sets target.threads to None — guard against it #}
{% if target.threads is not none %}{{ target.threads }}{% else %}null{% endif %}, {# target_threads #}

'{{ env_var("DBT_CLOUD_PROJECT_ID", "") }}', {# dbt_cloud_project_id #}
'{{ env_var("DBT_CLOUD_JOB_ID", "") }}', {# dbt_cloud_job_id #}
Expand Down Expand Up @@ -317,7 +320,8 @@
'{{ target.profile_name }}', {# target_profile_name #}
'{{ target.name }}', {# target_name #}
'{{ target.schema }}', {# target_schema #}
{{ target.threads }}, {# target_threads #}
{# dbt-fusion sets target.threads to None — guard against it #}
{% if target.threads is not none %}{{ target.threads }}{% else %}cast(null as {{ dbt.type_int() }}){% endif %}, {# target_threads #}

'{{ env_var('DBT_CLOUD_PROJECT_ID', '') }}', {# dbt_cloud_project_id #}
'{{ env_var('DBT_CLOUD_JOB_ID', '') }}', {# dbt_cloud_job_id #}
Expand Down
10 changes: 5 additions & 5 deletions macros/upload_individual_datasets/upload_test_executions.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@

{{ test.execution_time }}, {# total_node_runtime #}
null, {# rows_affected not available in Databricks #}
{{ 'null' if test.failures is none else test.failures }}, {# failures #}
{{ test.failures if test.failures is not none and test.failures != '' else 'null' }}, {# failures #}
'{{ test.message | replace("\\", "\\\\") | replace("'", "\\'") | replace('"', '\\"') | replace("\n", "\\n") }}', {# message #}
{{ adapter.dispatch('parse_json', 'dbt_artifacts')(tojson(test.adapter_response) | replace("\\", "\\\\") | replace("'", "\\'") | replace('"', '\\"')) }} {# adapter_response #}
)
Expand Down Expand Up @@ -133,7 +133,7 @@

{{ test.execution_time }}, {# total_node_runtime #}
null, {# rows_affected not available in Databricks #}
{{ 'null' if test.failures is none else test.failures }}, {# failures #}
{{ test.failures if test.failures is not none and test.failures != '' else 'null' }}, {# failures #}
$${{ test.message }}$$, {# message #}
$${{ tojson(test.adapter_response) }}$$ {# adapter_response #}
)
Expand Down Expand Up @@ -186,7 +186,7 @@

{{ test.execution_time }}, {# total_node_runtime #}
try_cast('{{ test.adapter_response.rows_affected }}' as int), {# rows_affected #}
{{ 'null' if test.failures is none else test.failures }}, {# failures #}
{{ test.failures if test.failures is not none and test.failures != '' else 'null' }}, {# failures #}
'{{ test.message | replace("\\", "\\\\") | replace("'", "\\'") | replace('"', '\\"') }}', {# message #}
'{{ tojson(test.adapter_response) | replace("\\", "\\\\") | replace("'", "\\'") | replace('"', '\\"') }}' {# adapter_response #}
)
Expand Down Expand Up @@ -226,7 +226,7 @@

{{ test.execution_time }}, {# total_node_runtime #}
null, {# rows_affected not available in Databricks #}
{{ 'null' if test.failures is none else test.failures }}, {# failures #}
{{ test.failures if test.failures is not none and test.failures != '' else 'null' }}, {# failures #}
'{{ test.message | replace("'", "''") }}', {# message #}
'{{ tojson(test.adapter_response) | replace("'", "''") }}' {# adapter_response #}
)
Expand Down Expand Up @@ -276,7 +276,7 @@
{% endif %}
, {# rows_affected #}

{{ 'null' if test.failures is none else test.failures }}, {# failures #}
{{ test.failures if test.failures is not none and test.failures != '' else 'null' }}, {# failures #}
'{{ test.message | replace("'", "''") }}', {# message #}
'{{ tojson(test.adapter_response) | replace("'", "''") }}' {# adapter_response #}
)
Expand Down