diff --git a/models/bronze/prices/bronze__complete_native_asset_metadata.sql b/models/bronze/prices/bronze__complete_native_asset_metadata.sql index e6c6d76..85feb82 100644 --- a/models/bronze/prices/bronze__complete_native_asset_metadata.sql +++ b/models/bronze/prices/bronze__complete_native_asset_metadata.sql @@ -21,6 +21,3 @@ FROM 'crosschain_silver', 'complete_native_asset_metadata' ) }} -WHERE - blockchain = 'near protocol' - AND symbol = 'NEAR' diff --git a/models/bronze/prices/bronze__complete_native_prices.sql b/models/bronze/prices/bronze__complete_native_prices.sql index adcd940..2a5d43e 100644 --- a/models/bronze/prices/bronze__complete_native_prices.sql +++ b/models/bronze/prices/bronze__complete_native_prices.sql @@ -24,6 +24,3 @@ FROM 'crosschain_silver', 'complete_native_prices' ) }} -WHERE - blockchain = 'near protocol' - AND symbol = 'NEAR' diff --git a/models/bronze/prices/bronze__complete_provider_asset_metadata.sql b/models/bronze/prices/bronze__complete_provider_asset_metadata.sql index 0c26d1c..f5ecd63 100644 --- a/models/bronze/prices/bronze__complete_provider_asset_metadata.sql +++ b/models/bronze/prices/bronze__complete_provider_asset_metadata.sql @@ -21,9 +21,3 @@ FROM 'crosschain_silver', 'complete_provider_asset_metadata' ) }} -WHERE - platform IN ( - 'NEAR Protocol', - 'Near', - 'near-protocol' - ) diff --git a/models/bronze/prices/bronze__complete_provider_prices.sql b/models/bronze/prices/bronze__complete_provider_prices.sql index 33f289b..25b72bd 100644 --- a/models/bronze/prices/bronze__complete_provider_prices.sql +++ b/models/bronze/prices/bronze__complete_provider_prices.sql @@ -21,4 +21,3 @@ FROM 'crosschain_silver', 'complete_provider_prices' ) }} --- prices for all ids diff --git a/models/bronze/prices/bronze__complete_token_asset_metadata.sql b/models/bronze/prices/bronze__complete_token_asset_metadata.sql index 9ef3a0f..cbcb771 100644 --- a/models/bronze/prices/bronze__complete_token_asset_metadata.sql +++ b/models/bronze/prices/bronze__complete_token_asset_metadata.sql @@ -25,5 +25,3 @@ FROM 'crosschain_silver', 'complete_token_asset_metadata' ) }} -WHERE - lower(blockchain) IN ('near', 'near protocol') diff --git a/models/bronze/prices/bronze__complete_token_prices.sql b/models/bronze/prices/bronze__complete_token_prices.sql index f226767..fa2f9eb 100644 --- a/models/bronze/prices/bronze__complete_token_prices.sql +++ b/models/bronze/prices/bronze__complete_token_prices.sql @@ -28,5 +28,3 @@ FROM 'crosschain_silver', 'complete_token_prices' ) }} -WHERE - lower(blockchain) IN ('near', 'near protocol') diff --git a/models/gold/defi/defi__ez_bridge_activity.sql b/models/gold/defi/defi__ez_bridge_activity.sql index 720b670..6b3644b 100644 --- a/models/gold/defi/defi__ez_bridge_activity.sql +++ b/models/gold/defi/defi__ez_bridge_activity.sql @@ -46,7 +46,7 @@ labels AS ( ORDER BY asset_identifier ) = 1) ), -prices_crosschain AS ( +prices AS ( SELECT DISTINCT token_address, blockchain, @@ -57,7 +57,7 @@ prices_crosschain AS ( is_verified, hour FROM - {{ source('crosschain_price', 'ez_prices_hourly') }} + {{ ref('silver__complete_token_prices') }} WHERE NOT is_native AND is_verified @@ -76,7 +76,7 @@ prices_native AS ( is_verified, hour FROM - {{ source('crosschain_price', 'ez_prices_hourly') }} + {{ ref('silver__complete_native_prices') }} WHERE is_native AND is_verified diff --git a/models/gold/price/price__dim_asset_metadata.sql b/models/gold/price/price__dim_asset_metadata.sql index ea7175a..f517749 100644 --- a/models/gold/price/price__dim_asset_metadata.sql +++ b/models/gold/price/price__dim_asset_metadata.sql @@ -18,3 +18,9 @@ SELECT complete_provider_asset_metadata_id AS dim_asset_metadata_id FROM {{ ref('silver__complete_provider_asset_metadata') }} +WHERE + platform IN ( + 'NEAR Protocol', + 'Near', + 'near-protocol' + ) diff --git a/models/gold/price/price__ez_asset_metadata.sql b/models/gold/price/price__ez_asset_metadata.sql index db8b49f..0b3c029 100644 --- a/models/gold/price/price__ez_asset_metadata.sql +++ b/models/gold/price/price__ez_asset_metadata.sql @@ -20,6 +20,8 @@ SELECT complete_token_asset_metadata_id AS ez_asset_metadata_id FROM {{ ref('silver__complete_token_asset_metadata') }} +WHERE + lower(blockchain) IN ('near', 'near protocol') UNION ALL SELECT NULL AS token_address, @@ -36,3 +38,6 @@ SELECT complete_native_asset_metadata_id AS ez_asset_metadata_id FROM {{ ref('silver__complete_native_asset_metadata') }} +WHERE + blockchain = 'near protocol' + AND symbol = 'NEAR' diff --git a/models/gold/price/price__ez_prices_hourly.sql b/models/gold/price/price__ez_prices_hourly.sql index 4075b45..9d4e718 100644 --- a/models/gold/price/price__ez_prices_hourly.sql +++ b/models/gold/price/price__ez_prices_hourly.sql @@ -22,6 +22,8 @@ SELECT complete_token_prices_id AS ez_prices_hourly_id FROM {{ ref('silver__complete_token_prices') }} +WHERE + lower(blockchain) IN ('near', 'near protocol') UNION ALL SELECT HOUR, @@ -40,3 +42,6 @@ SELECT complete_native_prices_id AS ez_prices_hourly_id FROM {{ ref('silver__complete_native_prices') }} +WHERE + blockchain = 'near protocol' + AND symbol = 'NEAR' diff --git a/models/gold/price/price__fact_prices_ohlc_hourly.sql b/models/gold/price/price__fact_prices_ohlc_hourly.sql index 06a808d..cdf76c8 100644 --- a/models/gold/price/price__fact_prices_ohlc_hourly.sql +++ b/models/gold/price/price__fact_prices_ohlc_hourly.sql @@ -18,3 +18,8 @@ SELECT complete_provider_prices_id AS fact_prices_ohlc_hourly_id FROM {{ ref('silver__complete_provider_prices') }} +WHERE platform IN ( + 'NEAR Protocol', + 'Near', + 'near-protocol' +) diff --git a/models/silver/prices/silver__complete_provider_prices.sql b/models/silver/prices/silver__complete_provider_prices.sql index 5393b76..c7f03dd 100644 --- a/models/silver/prices/silver__complete_provider_prices.sql +++ b/models/silver/prices/silver__complete_provider_prices.sql @@ -14,6 +14,7 @@ SELECT high, low, CLOSE, + m.platform, p.provider, p.source, p._inserted_timestamp,