From be3b3a0f5b3440b331a28bf6a713fddc52cbc09f Mon Sep 17 00:00:00 2001 From: yulike Date: Thu, 7 Apr 2022 18:46:42 -0400 Subject: [PATCH] Update thorchain__daily_pool_stats.sql --- .../thorchain/thorchain__daily_pool_stats.sql | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/models/thorchain/thorchain__daily_pool_stats.sql b/models/thorchain/thorchain__daily_pool_stats.sql index 4e8b291a..bdc9ce03 100644 --- a/models/thorchain/thorchain__daily_pool_stats.sql +++ b/models/thorchain/thorchain__daily_pool_stats.sql @@ -23,9 +23,9 @@ pool_fees AS ( rewards AS system_rewards, rewards * rune_usd AS system_rewards_usd, asset_liquidity_fees, - asset_liquidity_fees * asset_usd AS asset_liquidity_fees_usd, + (asset_liquidity_fees * asset_usd) AS asset_liquidity_fees_usd, rune_liquidity_fees, - rune_liquidity_fees * rune_usd AS rune_liquidity_fees_usd + (rune_liquidity_fees * rune_usd) AS rune_liquidity_fees_usd FROM {{ ref('thorchain__pool_block_fees') }} pbf JOIN daily_rune_price drp ON pbf.day = drp.day AND pbf.pool_name = drp.pool_name ) @@ -39,20 +39,23 @@ SELECT COALESCE(asset_price, 0) AS asset_price, COALESCE(asset_price_usd, 0) AS asset_price_usd, COALESCE(rune_depth / POW(10, 8), 0) AS rune_liquidity, - COALESCE(asset_price_usd / rune_usd, 0) AS rune_price, + CASE + WHEN (rune_usd IS NULL OR rune_usd = 0) THEN 0 + ELSE COALESCE(asset_price_usd / rune_usd, 0) + END AS rune_price, COALESCE(rune_usd, 0) AS rune_price_usd, COALESCE(add_liquidity_count, 0) AS add_liquidity_count, COALESCE(add_asset_liquidity_volume / POW(10, 8), 0) AS add_asset_liquidity, - COALESCE(add_asset_liquidity_volume / POW(10, 8) * asset_usd, 0) AS add_asset_liquidity_usd, + COALESCE((add_asset_liquidity_volume / POW(10, 8)) * asset_usd, 0) AS add_asset_liquidity_usd, COALESCE(add_rune_liquidity_volume / POW(10, 8), 0) AS add_rune_liquidity, - COALESCE(add_rune_liquidity_volume / POW(10, 8) * rune_usd, 0) AS add_rune_liquidity_usd, + COALESCE((add_rune_liquidity_volume / POW(10, 8)) * rune_usd, 0) AS add_rune_liquidity_usd, COALESCE(withdraw_count, 0) AS withdraw_count, COALESCE(withdraw_asset_volume / POW(10, 8), 0) AS withdraw_asset_liquidity, - COALESCE(withdraw_asset_volume / POW(10, 8) * asset_usd, 0) AS withdraw_asset_liquidity_usd, + COALESCE((withdraw_asset_volume / POW(10, 8)) * asset_usd, 0) AS withdraw_asset_liquidity_usd, COALESCE(withdraw_rune_volume / POW(10, 8), 0) AS withdraw_rune_liquidity, COALESCE(withdraw_rune_volume / POW(10, 8) * rune_usd, 0) AS withdraw_rune_liquidity_usd, COALESCE(impermanent_loss_protection_paid / POW(10, 8), 0)AS il_protection_paid, - COALESCE(impermanent_loss_protection_paid / POW(10, 8) * rune_usd, 0) AS il_protection_paid_usd, + COALESCE((impermanent_loss_protection_paid / POW(10, 8)) * rune_usd, 0) AS il_protection_paid_usd, COALESCE(average_slip, 0) AS average_slip, COALESCE(to_asset_average_slip, 0) AS to_asset_average_slip, COALESCE(to_rune_average_slip, 0) AS to_rune_average_slip, @@ -60,11 +63,11 @@ SELECT COALESCE(to_asset_count, 0) AS to_asset_swap_count, COALESCE(to_rune_count, 0) AS to_rune_swap_count, COALESCE(swap_volume / POW(10, 8), 0) AS swap_volume_rune, - COALESCE(swap_volume / POW(10, 8) * rune_usd, 0) AS swap_volume_rune_usd, + COALESCE((swap_volume / POW(10, 8)) * rune_usd, 0) AS swap_volume_rune_usd, COALESCE(to_asset_volume / POW(10, 8), 0) AS to_asset_swap_volume, COALESCE(to_rune_volume / POW(10, 8), 0) AS to_rune_swap_volume, COALESCE(totalfees / POW(10, 8), 0) AS total_swap_fees_rune, - COALESCE(totalfees / POW(10, 8) * rune_usd, 0) AS total_swap_fees_usd, + COALESCE((totalfees / POW(10, 8)) * rune_usd, 0) AS total_swap_fees_usd, COALESCE(to_asset_fees / POW(10, 8), 0) AS total_asset_swap_fees, COALESCE(to_rune_fees / POW(10, 8), 0) AS total_asset_rune_fees, COALESCE(unique_member_count, 0) AS unique_member_count,