From 54aa3fd8afc55537f337eaf12224c458a6697306 Mon Sep 17 00:00:00 2001 From: Gemma Down Date: Thu, 14 Sep 2023 12:59:36 +0100 Subject: [PATCH] Revert "Remove unused `rows_affected` column in `test_executions` #195" This reverts commit 9182fdcb281362d04831371636757846cef2c577. --- macros/upload_individual_datasets/upload_test_executions.sql | 5 ++++- macros/upload_results/get_column_name_lists.sql | 1 + models/fct_dbt__test_executions.sql | 1 + models/fct_dbt__test_executions.yml | 2 ++ models/sources/test_executions.sql | 1 + models/sources/test_executions.yml | 2 ++ models/staging/stg_dbt__test_executions.sql | 1 + models/staging/stg_dbt__test_executions.yml | 2 ++ 8 files changed, 14 insertions(+), 1 deletion(-) diff --git a/macros/upload_individual_datasets/upload_test_executions.sql b/macros/upload_individual_datasets/upload_test_executions.sql index 84ef217b..60986658 100644 --- a/macros/upload_individual_datasets/upload_test_executions.sql +++ b/macros/upload_individual_datasets/upload_test_executions.sql @@ -17,7 +17,8 @@ {{ adapter.dispatch('column_identifier', 'dbt_artifacts')(9) }}, {{ adapter.dispatch('column_identifier', 'dbt_artifacts')(10) }}, {{ adapter.dispatch('column_identifier', 'dbt_artifacts')(11) }}, - {{ adapter.dispatch('parse_json', 'dbt_artifacts')(adapter.dispatch('column_identifier', 'dbt_artifacts')(12)) }} + {{ adapter.dispatch('column_identifier', 'dbt_artifacts')(12) }}, + {{ adapter.dispatch('parse_json', 'dbt_artifacts')(adapter.dispatch('column_identifier', 'dbt_artifacts')(13)) }} from values {% for test in tests -%} ( @@ -56,6 +57,7 @@ {% endif %} {{ test.execution_time }}, {# total_node_runtime #} + null, {# rows_affected not available in Databricks #} {{ 'null' if test.failures is none else test.failures }}, {# failures #} '{{ test.message | replace("\\", "\\\\") | replace("'", "\\'") | replace('"', '\\"') }}', {# message #} '{{ tojson(test.adapter_response) | replace("\\", "\\\\") | replace("'", "\\'") | replace('"', '\\"') }}' {# adapter_response #} @@ -109,6 +111,7 @@ {% endif %} {{ test.execution_time }}, {# total_node_runtime #} + null, {# rows_affected not available in Databricks #} {{ 'null' if test.failures is none else test.failures }}, {# 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 #} diff --git a/macros/upload_results/get_column_name_lists.sql b/macros/upload_results/get_column_name_lists.sql index eb107e33..050974cb 100644 --- a/macros/upload_results/get_column_name_lists.sql +++ b/macros/upload_results/get_column_name_lists.sql @@ -211,6 +211,7 @@ compile_started_at, query_completed_at, total_node_runtime, + rows_affected, failures, message, adapter_response diff --git a/models/fct_dbt__test_executions.sql b/models/fct_dbt__test_executions.sql index 5e227af5..b921df43 100644 --- a/models/fct_dbt__test_executions.sql +++ b/models/fct_dbt__test_executions.sql @@ -18,6 +18,7 @@ test_executions as ( compile_started_at, query_completed_at, total_node_runtime, + rows_affected, failures, message from base diff --git a/models/fct_dbt__test_executions.yml b/models/fct_dbt__test_executions.yml index 6541a7ff..35cae002 100644 --- a/models/fct_dbt__test_executions.yml +++ b/models/fct_dbt__test_executions.yml @@ -14,6 +14,8 @@ models: description: '{{ doc("node_id") }}' - name: query_completed_at description: '{{ doc("query_completed_at") }}' + - name: rows_affected + description: '{{ doc("rows_affected") }}' - name: status description: '{{ doc("status") }}' - name: test_execution_id diff --git a/models/sources/test_executions.sql b/models/sources/test_executions.sql index 4f0e19f7..50d37980 100644 --- a/models/sources/test_executions.sql +++ b/models/sources/test_executions.sql @@ -13,6 +13,7 @@ select cast(null as {{ type_timestamp() }}) as compile_started_at, cast(null as {{ type_timestamp() }}) as query_completed_at, cast(null as {{ type_float() }}) as total_node_runtime, + cast(null as {{ type_int() }}) as rows_affected, cast(null as {{ type_int() }}) as failures, cast(null as {{ type_string() }}) as message, cast(null as {{ type_json() }}) as adapter_response diff --git a/models/sources/test_executions.yml b/models/sources/test_executions.yml index 4449a37d..e851c7c5 100644 --- a/models/sources/test_executions.yml +++ b/models/sources/test_executions.yml @@ -22,6 +22,8 @@ models: description: '{{ doc("query_completed_at") }}' - name: total_node_runtime description: '{{ doc("total_node_runtime") }}' + - name: rows_affected + description: '{{ doc("rows_affected") }}' - name: failures description: '{{ doc("failures") }}' - name: message diff --git a/models/staging/stg_dbt__test_executions.sql b/models/staging/stg_dbt__test_executions.sql index 9ace3de5..ca7ea868 100644 --- a/models/staging/stg_dbt__test_executions.sql +++ b/models/staging/stg_dbt__test_executions.sql @@ -18,6 +18,7 @@ enhanced as ( compile_started_at, query_completed_at, total_node_runtime, + rows_affected, failures, message from base diff --git a/models/staging/stg_dbt__test_executions.yml b/models/staging/stg_dbt__test_executions.yml index aab7cfd2..93d62fe4 100644 --- a/models/staging/stg_dbt__test_executions.yml +++ b/models/staging/stg_dbt__test_executions.yml @@ -14,6 +14,8 @@ models: description: '{{ doc("node_id") }}' - name: query_completed_at description: '{{ doc("query_completed_at") }}' + - name: rows_affected + description: '{{ doc("rows_affected") }}' - name: run_started_at description: '{{ doc("run_started_at") }}' - name: status