From 6c0745de7d674baadc473a75bf0d1861e307bc42 Mon Sep 17 00:00:00 2001
From: San Yong <22216004+SanYongxie@users.noreply.github.com>
Date: Wed, 14 May 2025 01:00:35 +0800
Subject: [PATCH] clean final tables

---
 .../silver_dex__velodrome_v3_pools.sql        | 42 +++++-------
 .../silver_dex__velodrome_v3_swaps.sql        | 66 +++++++++----------
 2 files changed, 48 insertions(+), 60 deletions(-)

diff --git a/models/silver/defi/dex/velodrome/silver_dex__velodrome_v3_pools.sql b/models/silver/defi/dex/velodrome/silver_dex__velodrome_v3_pools.sql
index 5d4eee8e..781728ee 100644
--- a/models/silver/defi/dex/velodrome/silver_dex__velodrome_v3_pools.sql
+++ b/models/silver/defi/dex/velodrome/silver_dex__velodrome_v3_pools.sql
@@ -75,31 +75,25 @@ AND _inserted_timestamp >= (
 )
 AND _inserted_timestamp >= SYSDATE() - INTERVAL '7 day'
 {% endif %}
-),
-FINAL AS (
-    SELECT
-        block_number,
-        block_timestamp,
-        tx_hash,
-        p.contract_address,
-        token0_address,
-        token1_address,
-        tick_spacing,
-        pool_address,
-        COALESCE(
-            init_tick,
-            0
-        ) AS init_tick,
-        p._log_id AS _id,
-        p._inserted_timestamp
-    FROM
-        created_pools p
-        LEFT JOIN initial_info i
-        ON p.pool_address = i.contract_address
 )
 SELECT
-    *
+    block_number,
+    block_timestamp,
+    tx_hash,
+    p.contract_address,
+    token0_address,
+    token1_address,
+    tick_spacing,
+    pool_address,
+    COALESCE(
+        init_tick,
+        0
+    ) AS init_tick,
+    p._log_id AS _id,
+    p._inserted_timestamp
 FROM
-    FINAL qualify(ROW_NUMBER() over(PARTITION BY pool_address
+    created_pools p
+    LEFT JOIN initial_info i
+    ON p.pool_address = i.contract_address qualify(ROW_NUMBER() over(PARTITION BY p.pool_address
 ORDER BY
-    _inserted_timestamp DESC)) = 1
\ No newline at end of file
+    p._inserted_timestamp DESC)) = 1
diff --git a/models/silver/defi/dex/velodrome/silver_dex__velodrome_v3_swaps.sql b/models/silver/defi/dex/velodrome/silver_dex__velodrome_v3_swaps.sql
index a9814f7f..7d671b37 100644
--- a/models/silver/defi/dex/velodrome/silver_dex__velodrome_v3_swaps.sql
+++ b/models/silver/defi/dex/velodrome/silver_dex__velodrome_v3_swaps.sql
@@ -59,43 +59,37 @@ pool_data AS (
         pool_address
     FROM
         {{ ref('silver_dex__velodrome_v3_pools') }}
-),
-FINAL AS (
-    SELECT
-        block_number,
-        block_timestamp,
-        tx_hash,
-        contract_address AS pool_address,
-        contract_address,
-        recipient,
-        sender,
-        tick,
-        tick_spacing,
-        liquidity,
-        event_index,
-        token0_address,
-        token1_address,
-        CONCAT(
-            tx_hash :: STRING,
-            '-',
-            event_index :: STRING
-        ) AS _log_id,
-        modified_timestamp AS _inserted_timestamp,
-        origin_function_signature,
-        origin_from_address,
-        origin_to_address,
-        amount0_unadj,
-        amount1_unadj,
-        'Swap' AS event_name,
-        'velodrome-v3' AS platform
-    FROM
-        base_swaps
-        INNER JOIN pool_data
-        ON pool_data.pool_address = base_swaps.contract_address
 )
 SELECT
-    *
+    block_number,
+    block_timestamp,
+    tx_hash,
+    contract_address AS pool_address,
+    contract_address,
+    recipient,
+    sender,
+    tick,
+    tick_spacing,
+    liquidity,
+    event_index,
+    token0_address,
+    token1_address,
+    CONCAT(
+        tx_hash :: STRING,
+        '-',
+        event_index :: STRING
+    ) AS _log_id,
+    modified_timestamp AS _inserted_timestamp,
+    origin_function_signature,
+    origin_from_address,
+    origin_to_address,
+    amount0_unadj,
+    amount1_unadj,
+    'Swap' AS event_name,
+    'velodrome-v3' AS platform
 FROM
-    FINAL qualify(ROW_NUMBER() over(PARTITION BY _log_id
+    base_swaps
+    INNER JOIN pool_data
+    ON pool_data.pool_address = base_swaps.contract_address qualify(ROW_NUMBER() over(PARTITION BY _log_id
 ORDER BY
-    _inserted_timestamp DESC)) = 1
\ No newline at end of file
+    _inserted_timestamp DESC)) = 1