diff --git a/models/gold/core/core__ez_decoded_event_logs.sql b/models/gold/core/core__ez_decoded_event_logs.sql index 07e7d30..af403eb 100644 --- a/models/gold/core/core__ez_decoded_event_logs.sql +++ b/models/gold/core/core__ez_decoded_event_logs.sql @@ -59,9 +59,10 @@ FROM LEFT JOIN {{ ref('silver__contracts') }} C USING (contract_address) {% if is_incremental() %} -AND l.modified_timestamp > ( - SELECT - COALESCE(MAX(modified_timestamp), '2000-01-01' :: TIMESTAMP) - FROM - {{ this }}) - {% endif %} +WHERE + l.modified_timestamp > ( + SELECT + COALESCE(MAX(modified_timestamp), '2000-01-01' :: TIMESTAMP) + FROM + {{ this }}) + {% endif %} diff --git a/models/silver/defi/dex/balancer/silver_dex__balancer_pools.sql b/models/silver/defi/dex/balancer/silver_dex__balancer_pools.sql index 708da5c..4f36902 100644 --- a/models/silver/defi/dex/balancer/silver_dex__balancer_pools.sql +++ b/models/silver/defi/dex/balancer/silver_dex__balancer_pools.sql @@ -82,6 +82,16 @@ tokens_registered AS ( pools_registered ) AND tx_succeeded + +{% if is_incremental() %} +AND _inserted_timestamp >= ( + SELECT + MAX(_inserted_timestamp) - INTERVAL '12 hours' + FROM + {{ this }} +) +AND block_timestamp >= SYSDATE() - INTERVAL '7 day' +{% endif %} ), function_sigs AS ( SELECT diff --git a/models/silver/defi/lending/morpho/silver__morpho_liquidations.sql b/models/silver/defi/lending/morpho/silver__morpho_liquidations.sql index 6198842..d06e6ec 100644 --- a/models/silver/defi/lending/morpho/silver__morpho_liquidations.sql +++ b/models/silver/defi/lending/morpho/silver__morpho_liquidations.sql @@ -105,6 +105,16 @@ logs AS( FROM traces ) + +{% if is_incremental() %} +AND _inserted_timestamp >= ( + SELECT + MAX(_inserted_timestamp) - INTERVAL '12 hours' + FROM + {{ this }} +) +AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day' +{% endif %} ) SELECT l.tx_hash, diff --git a/models/silver/nft/sales/silver__seaport_1_5_sales.sql b/models/silver/nft/sales/silver__seaport_1_5_sales.sql index 7fd4a83..3155cc2 100644 --- a/models/silver/nft/sales/silver__seaport_1_5_sales.sql +++ b/models/silver/nft/sales/silver__seaport_1_5_sales.sql @@ -84,7 +84,7 @@ AND modified_timestamp >= ( FROM {{ this }} ) -AND modified_timestamp >= SYSDATE() - INTERVAL '7 day' +AND block_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), raw_logs_event_index_fill AS ( @@ -1887,7 +1887,7 @@ AND modified_timestamp >= ( FROM {{ this }} ) -AND modified_timestamp >= SYSDATE() - INTERVAL '7 day' +AND block_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), nft_transfer_operator AS ( @@ -1929,7 +1929,7 @@ AND modified_timestamp >= ( FROM {{ this }} ) -AND modified_timestamp >= SYSDATE() - INTERVAL '7 day' +AND block_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), final_seaport AS ( diff --git a/models/silver/nft/sales/silver__seaport_1_6_sales.sql b/models/silver/nft/sales/silver__seaport_1_6_sales.sql index 4efbcdb..5c54e34 100644 --- a/models/silver/nft/sales/silver__seaport_1_6_sales.sql +++ b/models/silver/nft/sales/silver__seaport_1_6_sales.sql @@ -82,7 +82,7 @@ AND modified_timestamp >= ( FROM {{ this }} ) -AND modified_timestamp >= SYSDATE() - INTERVAL '7 day' +AND block_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), raw_logs_event_index_fill AS ( @@ -1885,7 +1885,7 @@ AND modified_timestamp >= ( FROM {{ this }} ) -AND modified_timestamp >= SYSDATE() - INTERVAL '7 day' +AND block_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), nft_transfer_operator AS ( @@ -1927,7 +1927,7 @@ AND modified_timestamp >= ( FROM {{ this }} ) -AND modified_timestamp >= SYSDATE() - INTERVAL '7 day' +AND block_timestamp >= SYSDATE() - INTERVAL '7 day' {% endif %} ), final_seaport AS (