Fix chainlink ocr incremental error on gas_daily and request_daily (d…

…uneanalytics#4281)
we1she2 · Sep 7, 2023 · e0bc52b · e0bc52b
1 parent d1d76b9
commit e0bc52b
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 16 deletions.
diff --git a/models/chainlink/arbitrum/chainlink_arbitrum_ocr_gas_daily.sql b/models/chainlink/arbitrum/chainlink_arbitrum_ocr_gas_daily.sql
@@ -40,7 +40,7 @@ WITH
     {% if is_incremental() %}
       WHERE
         fulfilled.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
-        AND reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
+        OR reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
     {% endif %}
     GROUP BY
       1, 2

diff --git a/models/chainlink/arbitrum/chainlink_arbitrum_ocr_request_daily.sql b/models/chainlink/arbitrum/chainlink_arbitrum_ocr_request_daily.sql
@@ -39,7 +39,7 @@ WITH
     {% if is_incremental() %}
       WHERE
         fulfilled.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
-        AND reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
+        OR reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
     {% endif %}
     GROUP BY
       1, 2

diff --git a/models/chainlink/avalanche_c/chainlink_avalanche_c_ocr_gas_daily.sql b/models/chainlink/avalanche_c/chainlink_avalanche_c_ocr_gas_daily.sql
@@ -40,7 +40,7 @@ WITH
     {% if is_incremental() %}
       WHERE
         fulfilled.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
-        AND reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
+        OR reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
     {% endif %}
     GROUP BY
       1, 2

diff --git a/models/chainlink/avalanche_c/chainlink_avalanche_c_ocr_request_daily.sql b/models/chainlink/avalanche_c/chainlink_avalanche_c_ocr_request_daily.sql
@@ -39,7 +39,7 @@ WITH
     {% if is_incremental() %}
       WHERE
         fulfilled.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
-        AND reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
+        OR reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
     {% endif %}
     GROUP BY
       1, 2

diff --git a/models/chainlink/bnb/chainlink_bnb_ocr_gas_daily.sql b/models/chainlink/bnb/chainlink_bnb_ocr_gas_daily.sql
@@ -40,7 +40,7 @@ WITH
     {% if is_incremental() %}
       WHERE
         fulfilled.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
-        AND reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
+        OR reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
     {% endif %}
     GROUP BY
       1, 2

diff --git a/models/chainlink/bnb/chainlink_bnb_ocr_request_daily.sql b/models/chainlink/bnb/chainlink_bnb_ocr_request_daily.sql
@@ -39,7 +39,7 @@ WITH
     {% if is_incremental() %}
       WHERE
         fulfilled.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
-        AND reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
+        OR reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
     {% endif %}
     GROUP BY
       1, 2

diff --git a/models/chainlink/ethereum/chainlink_ethereum_ocr_gas_daily.sql b/models/chainlink/ethereum/chainlink_ethereum_ocr_gas_daily.sql
@@ -40,7 +40,7 @@ WITH
     {% if is_incremental() %}
       WHERE
         fulfilled.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
-        AND reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
+        OR reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
     {% endif %}
     GROUP BY
       1, 2

diff --git a/models/chainlink/ethereum/chainlink_ethereum_ocr_request_daily.sql b/models/chainlink/ethereum/chainlink_ethereum_ocr_request_daily.sql
@@ -39,7 +39,7 @@ WITH
     {% if is_incremental() %}
       WHERE
         fulfilled.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
-        AND reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
+        OR reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
     {% endif %}
     GROUP BY
       1, 2

diff --git a/models/chainlink/fantom/chainlink_fantom_ocr_gas_daily.sql b/models/chainlink/fantom/chainlink_fantom_ocr_gas_daily.sql
@@ -40,7 +40,7 @@ WITH
     {% if is_incremental() %}
       WHERE
         fulfilled.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
-        AND reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
+        OR reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
     {% endif %}
     GROUP BY
       1, 2

diff --git a/models/chainlink/fantom/chainlink_fantom_ocr_request_daily.sql b/models/chainlink/fantom/chainlink_fantom_ocr_request_daily.sql
@@ -39,7 +39,7 @@ WITH
     {% if is_incremental() %}
       WHERE
         fulfilled.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
-        AND reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
+        OR reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
     {% endif %}
     GROUP BY
       1, 2

diff --git a/models/chainlink/gnosis/chainlink_gnosis_ocr_gas_daily.sql b/models/chainlink/gnosis/chainlink_gnosis_ocr_gas_daily.sql
@@ -40,7 +40,7 @@ WITH
     {% if is_incremental() %}
       WHERE
         fulfilled.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
-        AND reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
+        OR reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
     {% endif %}
     GROUP BY
       1, 2

diff --git a/models/chainlink/gnosis/chainlink_gnosis_ocr_request_daily.sql b/models/chainlink/gnosis/chainlink_gnosis_ocr_request_daily.sql
@@ -39,7 +39,7 @@ WITH
     {% if is_incremental() %}
       WHERE
         fulfilled.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
-        AND reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
+        OR reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
     {% endif %}
     GROUP BY
       1, 2

diff --git a/models/chainlink/optimism/chainlink_optimism_ocr_gas_daily.sql b/models/chainlink/optimism/chainlink_optimism_ocr_gas_daily.sql
@@ -40,7 +40,7 @@ WITH
     {% if is_incremental() %}
       WHERE
         fulfilled.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
-        AND reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
+        OR reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
     {% endif %}
     GROUP BY
       1, 2

diff --git a/models/chainlink/optimism/chainlink_optimism_ocr_request_daily.sql b/models/chainlink/optimism/chainlink_optimism_ocr_request_daily.sql
@@ -39,7 +39,7 @@ WITH
     {% if is_incremental() %}
       WHERE
         fulfilled.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
-        AND reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
+        OR reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
     {% endif %}
     GROUP BY
       1, 2

diff --git a/models/chainlink/polygon/chainlink_polygon_ocr_gas_daily.sql b/models/chainlink/polygon/chainlink_polygon_ocr_gas_daily.sql
@@ -40,7 +40,7 @@ WITH
     {% if is_incremental() %}
       WHERE
         fulfilled.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
-        AND reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
+        OR reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
     {% endif %}
     GROUP BY
       1, 2

diff --git a/models/chainlink/polygon/chainlink_polygon_ocr_request_daily.sql b/models/chainlink/polygon/chainlink_polygon_ocr_request_daily.sql
@@ -39,7 +39,7 @@ WITH
     {% if is_incremental() %}
       WHERE
         fulfilled.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
-        AND reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
+        OR reverted.block_time >= date_trunc('day', now() - interval '{{incremental_interval}}' day)
     {% endif %}
     GROUP BY
       1, 2