From 3ab5ca75b7d8cf719778cfd8ca454de4e11927ba Mon Sep 17 00:00:00 2001
From: Michal Zander <mzander@syncad.com>
Date: Fri, 28 Feb 2025 08:47:20 +0000
Subject: [PATCH] Adjusted code for linter compliance on CI
---
.sqlfluff | 4 +-
backend/aggregated_history.sql | 119 +++++++++++++++++----------------
db/btracker_app.sql | 4 +-
3 files changed, 66 insertions(+), 61 deletions(-)
diff --git a/.sqlfluff b/.sqlfluff
index 0c3efb2..4239790 100644
--- a/.sqlfluff
+++ b/.sqlfluff
@@ -1,4 +1,6 @@
[sqlfluff]
dialect = postgres
max_line_length = 150
-exclude_rules = CP03, LT01, CP05, CP04
+exclude_rules = CP03
+
+warnings = LT01, CP05, PRS
diff --git a/backend/aggregated_history.sql b/backend/aggregated_history.sql
index c2c046f..9123917 100644
--- a/backend/aggregated_history.sql
+++ b/backend/aggregated_history.sql
@@ -1,3 +1,5 @@
+-- noqa: disable=AL01, AM05
+
SET ROLE btracker_owner;
DROP TYPE IF EXISTS balance_history_aggregation CASCADE;
@@ -10,38 +12,41 @@ CREATE TYPE balance_history_aggregation AS (
CREATE OR REPLACE VIEW balance_history_by_year AS
WITH get_year AS (
- SELECT
- account,
- nai,
- balance,
- min_balance,
- max_balance,
- source_op_block,
- date_trunc('year', updated_at) AS by_year,
- updated_at
- FROM balance_history_by_month
+ SELECT
+ account,
+ nai,
+ balance,
+ min_balance,
+ max_balance,
+ source_op_block,
+ updated_at,
+ DATE_TRUNC('year', updated_at) AS by_year
+ FROM balance_history_by_month
),
+
get_latest_updates AS (
- SELECT
- account,
- nai,
- balance,
- source_op_block,
- by_year,
- ROW_NUMBER() OVER (PARTITION BY account, nai, by_year ORDER BY updated_at DESC) AS rn_by_year
- FROM get_year bh
+ SELECT
+ account,
+ nai,
+ balance,
+ source_op_block,
+ by_year,
+ ROW_NUMBER() OVER (PARTITION BY account, nai, by_year ORDER BY updated_at DESC) AS rn_by_year
+ FROM get_year
),
+
get_min_max_balances_by_year AS (
- SELECT
- account,
- nai,
- by_year,
- MAX(max_balance) AS max_balance,
- MIN(min_balance) AS min_balance
- FROM get_year
- GROUP BY account, nai, by_year
+ SELECT
+ account,
+ nai,
+ by_year,
+ MAX(max_balance) AS max_balance,
+ MIN(min_balance) AS min_balance
+ FROM get_year
+ GROUP BY account, nai, by_year
)
- SELECT
+
+SELECT
gl.account,
gl.nai,
gl.balance,
@@ -49,17 +54,17 @@ get_min_max_balances_by_year AS (
gm.max_balance,
gl.source_op_block,
gl.by_year AS updated_at
- FROM get_latest_updates gl
- JOIN get_min_max_balances_by_year gm ON gl.account = gm.account AND gl.nai = gm.nai AND gl.by_year = gm.by_year
- WHERE rn_by_year = 1;
+FROM get_latest_updates gl
+JOIN get_min_max_balances_by_year gm ON gl.account = gm.account AND gl.nai = gm.nai AND gl.by_year = gm.by_year
+WHERE gl.rn_by_year = 1;
CREATE OR REPLACE FUNCTION get_balance_history_aggregation(
- _account_id INT,
- _coin_type INT,
- _granularity btracker_endpoints.granularity,
- _direction btracker_endpoints.sort_direction,
- _from_block INT,
- _to_block INT
+ _account_id INT,
+ _coin_type INT,
+ _granularity btracker_endpoints.granularity,
+ _direction btracker_endpoints.sort_direction,
+ _from_block INT,
+ _to_block INT
)
RETURNS SETOF balance_history_aggregation -- noqa: LT01, CP05
LANGUAGE 'plpgsql'
@@ -127,11 +132,11 @@ END
$$;
CREATE OR REPLACE FUNCTION get_balance_history_by_day(
- _account_id INT,
- _coin_type INT,
- _direction btracker_endpoints.sort_direction,
- _from_block INT,
- _to_block INT
+ _account_id INT,
+ _coin_type INT,
+ _direction btracker_endpoints.sort_direction,
+ _from_block INT,
+ _to_block INT
)
RETURNS SETOF balance_history_aggregation -- noqa: LT01, CP05
LANGUAGE 'plpgsql'
@@ -139,8 +144,8 @@ STABLE
AS
$$
DECLARE
- _from_timestamp TIMESTAMP := date_trunc('day',(SELECT b.created_at FROM hive.blocks_view b WHERE b.num = _from_block)::TIMESTAMP);
- _to_timestamp TIMESTAMP := date_trunc('day', (SELECT b.created_at FROM hive.blocks_view b WHERE b.num = _to_block)::TIMESTAMP);
+ _from_timestamp TIMESTAMP := DATE_TRUNC('day',(SELECT b.created_at FROM hive.blocks_view b WHERE b.num = _from_block)::TIMESTAMP);
+ _to_timestamp TIMESTAMP := DATE_TRUNC('day', (SELECT b.created_at FROM hive.blocks_view b WHERE b.num = _to_block)::TIMESTAMP);
BEGIN
RETURN QUERY (
@@ -221,11 +226,11 @@ END
$$;
CREATE OR REPLACE FUNCTION get_balance_history_by_month(
- _account_id INT,
- _coin_type INT,
- _direction btracker_endpoints.sort_direction,
- _from_block INT,
- _to_block INT
+ _account_id INT,
+ _coin_type INT,
+ _direction btracker_endpoints.sort_direction,
+ _from_block INT,
+ _to_block INT
)
RETURNS SETOF balance_history_aggregation -- noqa: LT01, CP05
LANGUAGE 'plpgsql'
@@ -233,8 +238,8 @@ STABLE
AS
$$
DECLARE
- _from_timestamp TIMESTAMP := date_trunc('month',(SELECT b.created_at FROM hive.blocks_view b WHERE b.num = _from_block)::TIMESTAMP);
- _to_timestamp TIMESTAMP := date_trunc('month', (SELECT b.created_at FROM hive.blocks_view b WHERE b.num = _to_block)::TIMESTAMP);
+ _from_timestamp TIMESTAMP := DATE_TRUNC('month',(SELECT b.created_at FROM hive.blocks_view b WHERE b.num = _from_block)::TIMESTAMP);
+ _to_timestamp TIMESTAMP := DATE_TRUNC('month', (SELECT b.created_at FROM hive.blocks_view b WHERE b.num = _to_block)::TIMESTAMP);
BEGIN
RETURN QUERY (
WITH date_series AS (
@@ -314,11 +319,11 @@ END
$$;
CREATE OR REPLACE FUNCTION get_balance_history_by_year(
- _account_id INT,
- _coin_type INT,
- _direction btracker_endpoints.sort_direction,
- _from_block INT,
- _to_block INT
+ _account_id INT,
+ _coin_type INT,
+ _direction btracker_endpoints.sort_direction,
+ _from_block INT,
+ _to_block INT
)
RETURNS SETOF balance_history_aggregation -- noqa: LT01, CP05
LANGUAGE 'plpgsql'
@@ -326,8 +331,8 @@ STABLE
AS
$$
DECLARE
- _from_timestamp TIMESTAMP := date_trunc('year',(SELECT b.created_at FROM hive.blocks_view b WHERE b.num = _from_block)::TIMESTAMP);
- _to_timestamp TIMESTAMP := date_trunc('year', (SELECT b.created_at FROM hive.blocks_view b WHERE b.num = _to_block)::TIMESTAMP);
+ _from_timestamp TIMESTAMP := DATE_TRUNC('year',(SELECT b.created_at FROM hive.blocks_view b WHERE b.num = _from_block)::TIMESTAMP);
+ _to_timestamp TIMESTAMP := DATE_TRUNC('year', (SELECT b.created_at FROM hive.blocks_view b WHERE b.num = _to_block)::TIMESTAMP);
BEGIN
RETURN QUERY (
WITH date_series AS (
diff --git a/db/btracker_app.sql b/db/btracker_app.sql
index 9827f71..2cb3f86 100644
--- a/db/btracker_app.sql
+++ b/db/btracker_app.sql
@@ -1,5 +1,3 @@
--- noqa: disable=CP03
-
SET ROLE btracker_owner;
DO $$
@@ -402,7 +400,7 @@ $$;
*/
CREATE OR REPLACE PROCEDURE main(
IN _appContext hive.context_name,
- IN _maxBlockLimit INT = NULL
+ IN _maxBlockLimit INT = null
)
LANGUAGE 'plpgsql'
AS
--
GitLab