From 62f8fe9d76596db3f81a13bc6221e2bceba93db6 Mon Sep 17 00:00:00 2001
From: Thomas Langton <155970791+tlangton3@users.noreply.github.com>
Date: Fri, 20 Jun 2025 10:35:27 +0100
Subject: [PATCH 1/2] Add new macros for retrieving result rows in Agate

---
 .../macros/get_result_rows_agate.sql           | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/elementary/monitor/dbt_project/macros/get_result_rows_agate.sql b/elementary/monitor/dbt_project/macros/get_result_rows_agate.sql
index d92bcbe41..9fa4b795c 100644
--- a/elementary/monitor/dbt_project/macros/get_result_rows_agate.sql
+++ b/elementary/monitor/dbt_project/macros/get_result_rows_agate.sql
@@ -1,4 +1,8 @@
 {% macro get_result_rows_agate(days_back, valid_ids_query = none) %}
+  {% do return(adapter.dispatch('get_result_rows_agate', 'elementary')(days_back, valid_ids_query)) %}
+{% endmacro %}
+
+{% macro default__get_result_rows_agate(days_back, valid_ids_query = none) %}
   {% set query %}
   select
     elementary_test_results_id,
@@ -11,3 +15,17 @@
   {% endset %}
   {% do return(elementary.run_query(query).group_by("elementary_test_results_id")) %}
 {% endmacro %}
+
+{% macro bigquery__get_result_rows_agate(days_back, valid_ids_query = none) %}
+  {% set query %}
+  select
+    elementary_test_results_id,
+    result_row
+  from {{ ref("elementary", "test_result_rows") }}
+  where detected_at >= {{ elementary.edr_timeadd('day', -1 * days_back, elementary.edr_current_timestamp()) }}
+  {% if valid_ids_query %}
+    and elementary_test_results_id in ({{ valid_ids_query }})
+  {% endif %}
+  {% endset %}
+  {% do return(elementary.run_query(query).group_by("elementary_test_results_id")) %}
+{% endmacro %}
\ No newline at end of file

From df4693fc5fed9d7c9a0442225abc40a6104dcb41 Mon Sep 17 00:00:00 2001
From: Thomas Langton <155970791+tlangton3@users.noreply.github.com>
Date: Tue, 18 Nov 2025 14:52:28 +0000
Subject: [PATCH 2/2] pr comments

---
 .../monitor/dbt_project/macros/get_result_rows_agate.sql  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/elementary/monitor/dbt_project/macros/get_result_rows_agate.sql b/elementary/monitor/dbt_project/macros/get_result_rows_agate.sql
index c2471961a..e5029084f 100644
--- a/elementary/monitor/dbt_project/macros/get_result_rows_agate.sql
+++ b/elementary/monitor/dbt_project/macros/get_result_rows_agate.sql
@@ -26,10 +26,14 @@
     elementary_test_results_id,
     result_row
   from {{ ref("elementary", "test_result_rows") }}
-  where detected_at >= {{ elementary.edr_timeadd('day', -1 * days_back, elementary.edr_current_timestamp()) }}
+  where detected_at > {{ elementary.edr_timeadd('day', -1 * days_back, elementary.edr_current_timestamp()) }}
   {% if valid_ids_query %}
     and elementary_test_results_id in ({{ valid_ids_query }})
   {% endif %}
   {% endset %}
-  {% do return(elementary.run_query(query).group_by("elementary_test_results_id")) %}
+  {% set res = elementary.run_query(query) %}
+  {% if not res %}
+    {% do return({}) %}
+  {% endif %}
+  {% do return(res.group_by("elementary_test_results_id")) %}
 {% endmacro %}
\ No newline at end of file