From b1b48edc7fc00789102d37730cd9a1d7a9bb912b Mon Sep 17 00:00:00 2001 From: jacksan Date: Mon, 21 Apr 2025 14:22:24 -0600 Subject: [PATCH 1/2] rm block id from any surrogate keys --- models/gold/price/price__fact_prices.sql | 2 +- models/silver/curated/defi/bridge/silver__bridge_rainbow.sql | 2 +- models/silver/prices/_legacy/silver__prices_oracle_s3.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/models/gold/price/price__fact_prices.sql b/models/gold/price/price__fact_prices.sql index 46ae892..1c76c02 100644 --- a/models/gold/price/price__fact_prices.sql +++ b/models/gold/price/price__fact_prices.sql @@ -18,7 +18,7 @@ WITH oracle_prices AS ( COALESCE( prices_oracle_id, {{ dbt_utils.generate_surrogate_key( - ['tx_hash', 'block_id', 'token_contract'] + ['tx_hash', 'token_contract'] ) }} ) AS fact_prices_id, inserted_timestamp, diff --git a/models/silver/curated/defi/bridge/silver__bridge_rainbow.sql b/models/silver/curated/defi/bridge/silver__bridge_rainbow.sql index 276701d..323477b 100644 --- a/models/silver/curated/defi/bridge/silver__bridge_rainbow.sql +++ b/models/silver/curated/defi/bridge/silver__bridge_rainbow.sql @@ -428,7 +428,7 @@ SELECT amount_raw AS amount_adj, 'rainbow' AS platform, {{ dbt_utils.generate_surrogate_key( - ['block_id', 'tx_hash', 'source_chain_id', 'destination_address', 'token_address', 'amount_raw'] + ['tx_hash', 'source_chain_id', 'destination_address', 'token_address', 'amount_raw'] ) }} AS bridge_rainbow_id, SYSDATE() AS inserted_timestamp, SYSDATE() AS modified_timestamp, diff --git a/models/silver/prices/_legacy/silver__prices_oracle_s3.sql b/models/silver/prices/_legacy/silver__prices_oracle_s3.sql index f3e2ec7..4a86681 100644 --- a/models/silver/prices/_legacy/silver__prices_oracle_s3.sql +++ b/models/silver/prices/_legacy/silver__prices_oracle_s3.sql @@ -101,7 +101,7 @@ FINAL AS ( SELECT *, {{ dbt_utils.generate_surrogate_key( - ['tx_hash', 'block_id', 'token_contract'] + ['tx_hash', 'token_contract'] ) }} AS prices_oracle_id, SYSDATE() AS inserted_timestamp, SYSDATE() AS modified_timestamp, From c982c1b1916bc3090b8fe0e33c6a2d852c6d0631 Mon Sep 17 00:00:00 2001 From: jacksan Date: Mon, 21 Apr 2025 16:03:37 -0600 Subject: [PATCH 2/2] rm not null tests due to unlabeled tokens --- models/gold/defi/defi__ez_intents.yml | 29 --------------------------- 1 file changed, 29 deletions(-) diff --git a/models/gold/defi/defi__ez_intents.yml b/models/gold/defi/defi__ez_intents.yml index ad46e25..4796ba2 100644 --- a/models/gold/defi/defi__ez_intents.yml +++ b/models/gold/defi/defi__ez_intents.yml @@ -122,50 +122,21 @@ models: - name: BLOCKCHAIN description: "{{ doc('blockchain') }}" - tests: - - not_null: - where: token_id not in ('nep141:eth.bridge.near', 'nep141:a35923162c49cf95e6bf26623385eb431ad920d3.factory.bridge.near', 'nep141:purge-558.meme-cooking.near', 'nep141:noear-324.meme-cooking.near', 'nep141:abg-966.meme-cooking.near', 'nep141:gnear-229.meme-cooking.near', 'nep141:gnosis-0xddafbb505ad214d7b80b1f830fccc89b60fb7a83.omft.near', 'nep141:keypom.near') and token_id not like 'nep245%' - name: CONTRACT_ADDRESS description: "{{ doc('contract_address') }}" - tests: - - not_null: - where: token_id not in ('nep141:eth.bridge.near', 'nep141:a35923162c49cf95e6bf26623385eb431ad920d3.factory.bridge.near', 'nep141:purge-558.meme-cooking.near', 'nep141:noear-324.meme-cooking.near', 'nep141:abg-966.meme-cooking.near', 'nep141:gnear-229.meme-cooking.near', 'nep141:gnosis-0xddafbb505ad214d7b80b1f830fccc89b60fb7a83.omft.near', 'nep141:keypom.near') and token_id not like 'nep245%' - name: IS_NATIVE description: "{{ doc('is_native') }}" - tests: - - not_null: - where: token_id not in ('nep141:eth.bridge.near', 'nep141:a35923162c49cf95e6bf26623385eb431ad920d3.factory.bridge.near', 'nep141:purge-558.meme-cooking.near', 'nep141:noear-324.meme-cooking.near', 'nep141:abg-966.meme-cooking.near', 'nep141:gnear-229.meme-cooking.near', 'nep141:gnosis-0xddafbb505ad214d7b80b1f830fccc89b60fb7a83.omft.near', 'nep141:keypom.near') and token_id not like 'nep245%' - - dbt_expectations.expect_column_values_to_be_in_type_list: - column_type_list: - - BOOLEAN - name: SYMBOL description: "{{ doc('symbol') }}" - tests: - - not_null: - where: token_id not in ('nep141:eth.bridge.near', 'nep141:a35923162c49cf95e6bf26623385eb431ad920d3.factory.bridge.near', 'nep141:purge-558.meme-cooking.near', 'nep141:noear-324.meme-cooking.near', 'nep141:abg-966.meme-cooking.near', 'nep141:gnear-229.meme-cooking.near', 'nep141:gnosis-0xddafbb505ad214d7b80b1f830fccc89b60fb7a83.omft.near', 'nep141:keypom.near') and token_id not like 'nep245%' - name: DECIMALS description: "{{ doc('decimals') }}" - tests: - - not_null: - where: token_id not in ('nep141:eth.bridge.near', 'nep141:a35923162c49cf95e6bf26623385eb431ad920d3.factory.bridge.near', 'nep141:purge-558.meme-cooking.near', 'nep141:noear-324.meme-cooking.near', 'nep141:abg-966.meme-cooking.near', 'nep141:gnear-229.meme-cooking.near', 'nep141:gnosis-0xddafbb505ad214d7b80b1f830fccc89b60fb7a83.omft.near', 'nep141:keypom.near') and token_id not like 'nep245%' - - dbt_expectations.expect_column_values_to_be_in_type_list: - column_type_list: - - NUMBER - - INTEGER - name: AMOUNT_ADJ description: "{{ doc('amount_adj') }}" - tests: - - not_null: - where: token_id not in ('nep141:eth.bridge.near', 'nep141:a35923162c49cf95e6bf26623385eb431ad920d3.factory.bridge.near', 'nep141:purge-558.meme-cooking.near', 'nep141:noear-324.meme-cooking.near', 'nep141:abg-966.meme-cooking.near', 'nep141:gnear-229.meme-cooking.near', 'nep141:gnosis-0xddafbb505ad214d7b80b1f830fccc89b60fb7a83.omft.near', 'nep141:keypom.near') and token_id not like 'nep245%' - - dbt_expectations.expect_column_values_to_be_in_type_list: - column_type_list: - - NUMBER - - FLOAT - name: PRICE description: "{{ doc('price_usd') }}"