From 49cd3e60de8cf290d9bf3cb577b49ce2861143df Mon Sep 17 00:00:00 2001
From: Jack Forgash <58153492+forgxyz@users.noreply.github.com>
Date: Fri, 14 Mar 2025 16:24:32 -0600
Subject: [PATCH] upd partition macro

---
 macros/manual_batch_refresh.sql               | 9 +++++----
 models/silver/core/silver__receipts_final.sql | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/macros/manual_batch_refresh.sql b/macros/manual_batch_refresh.sql
index 722f59e..ee06713 100644
--- a/macros/manual_batch_refresh.sql
+++ b/macros/manual_batch_refresh.sql
@@ -1,5 +1,6 @@
 {% macro partition_load_manual(
-        scope = 'no_buffer'
+        scope = 'no_buffer',
+        partition_field = '_partition_by_block_number'
     ) %}
     {# if range_start and range_end not set in cli, default to earliest rpc data #}
     {% set range_start = var(
@@ -19,17 +20,17 @@
         1
     ) %}
     {% if scope == 'front' %}
-        _partition_by_block_number BETWEEN {{ range_start }} - (
+        {{ partition_field }} BETWEEN {{ range_start }} - (
             10000 * {{ front_buffer }}
         )
         AND {{ range_end }}
 
         {% elif scope == 'end' %}
-        _partition_by_block_number BETWEEN {{ range_start }}
+        {{ partition_field }} BETWEEN {{ range_start }}
         AND {{ range_end }} + (
             10000 * {{ end_buffer }}
         ) {% elif scope == 'no_buffer' %}
-        _partition_by_block_number BETWEEN {{ range_start }}
+        {{ partition_field }} BETWEEN {{ range_start }}
         AND {{ range_end }}
     {% else %}
         TRUE
diff --git a/models/silver/core/silver__receipts_final.sql b/models/silver/core/silver__receipts_final.sql
index 807e15b..2fbe960 100644
--- a/models/silver/core/silver__receipts_final.sql
+++ b/models/silver/core/silver__receipts_final.sql
@@ -84,7 +84,7 @@ WITH txs_with_receipts AS (
         {{ ref('silver__transactions_v2') }}
     {% if var("MANUAL_FIX") %}
         WHERE
-            {{ partition_load_manual('no_buffer') }}
+            {{ partition_load_manual('no_buffer', 'partition_key') }}
         {% else %}
         {% if is_incremental() %}
             WHERE origin_block_timestamp :: DATE >= '{{min_bd}}'
@@ -101,7 +101,7 @@ blocks AS (
         {{ ref('silver__blocks_v2') }}
     {% if var("MANUAL_FIX") %}
         WHERE
-            {{ partition_load_manual('no_buffer') }}
+            {{ partition_load_manual('no_buffer', 'partition_key') }}
         {% else %}
         {% if is_incremental() %}
             WHERE block_timestamp :: DATE >= '{{min_bd}}' :: DATE