From f03a66cfc395734a706eb80bf49f2170874ed5bb Mon Sep 17 00:00:00 2001
From: Jack Forgash <58153492+forgxyz@users.noreply.github.com>
Date: Thu, 30 Jan 2025 19:24:37 -0700
Subject: [PATCH] fix incr clause

---
 models/gold/defi/defi__fact_intents.sql | 11 ++++++++---
 package-lock.yml                        | 26 ++++++++++++-------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/models/gold/defi/defi__fact_intents.sql b/models/gold/defi/defi__fact_intents.sql
index 1499cb0..db1527e 100644
--- a/models/gold/defi/defi__fact_intents.sql
+++ b/models/gold/defi/defi__fact_intents.sql
@@ -107,8 +107,13 @@ logs_base AS(
         AND block_timestamp >= '2024-11-01'
         AND TRY_PARSE_JSON(clean_log) :standard :: STRING in ('nep245', 'dip4')
 
-    {% if is_incremental() and not var("MANUAL_FIX") %}
-        AND block_timestamp::DATE >= '{{min_bd}}'
+    {% if var("MANUAL_FIX") %}
+        AND
+            {{ partition_load_manual('no_buffer') }}
+        {% else %}
+        {% if is_incremental() %}
+            AND block_timestamp::DATE >= '{{min_bd}}'
+        {% endif %}
     {% endif %}
 ),
 nep245_logs AS (
@@ -122,7 +127,7 @@ nep245_logs AS (
         TRY_PARSE_JSON(lb.clean_log) :standard :: STRING = 'nep245'
 
     {% if is_incremental() and not var("MANUAL_FIX") %}
-        WHERE 
+        AND 
             GREATEST(
                 COALESCE(lb.modified_timestamp, '1970-01-01'),
                 COALESCE(r.modified_timestamp, '1970-01-01')   
diff --git a/package-lock.yml b/package-lock.yml
index dfa2464..d2370f6 100644
--- a/package-lock.yml
+++ b/package-lock.yml
@@ -1,14 +1,14 @@
 packages:
-  - package: calogica/dbt_expectations
-    version: 0.8.2
-  - package: dbt-labs/dbt_utils
-    version: 1.0.0
-  - git: https://github.com/FlipsideCrypto/fsc-utils.git
-    revision: d3cf679e079f0cf06142de9386f215e55fe26b3b
-  - package: get-select/dbt_snowflake_query_tags
-    version: 2.5.0
-  - package: calogica/dbt_date
-    version: 0.7.2
-  - git: https://github.com/FlipsideCrypto/livequery-models.git
-    revision: b024188be4e9c6bc00ed77797ebdc92d351d620e
-sha1_hash: afea4db1f3b20c6d83e5854437824d1b589981f2
+- package: calogica/dbt_expectations
+  version: 0.8.2
+- package: dbt-labs/dbt_utils
+  version: 1.0.0
+- git: https://github.com/FlipsideCrypto/fsc-utils.git
+  revision: 6096046f00c5c27fa7b8d60ae6ec1dfe31d7fa10
+- package: get-select/dbt_snowflake_query_tags
+  version: 2.5.0
+- package: calogica/dbt_date
+  version: 0.7.2
+- git: https://github.com/FlipsideCrypto/livequery-base.git
+  revision: 006980d40fbbc48c2ad0f0b74efa37ec6fa1c74b
+sha1_hash: 197fe41257817dfd90f292d52002c6efb6c09305