From 11df0fbff1f277063ed4c563199d543a60aefa80 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Thu, 7 Apr 2022 07:53:48 +0000 Subject: [PATCH] Remove unused cumultative columns --- postgres/cumultative-balances.sql.go | 18 +++++++----------- postgres/queries/cumultative-balances.sql | 6 +++--- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/postgres/cumultative-balances.sql.go b/postgres/cumultative-balances.sql.go index 3b4b636..ea7e6ef 100644 --- a/postgres/cumultative-balances.sql.go +++ b/postgres/cumultative-balances.sql.go @@ -13,21 +13,19 @@ import ( const getCumultativeBalances = `-- name: GetCumultativeBalances :many SELECT COALESCE(ass.date, tra.date), COALESCE(ass.category_id, tra.category_id), - COALESCE(ass.amount, 0)::decimal(12,2) as assignments, SUM(ass.amount) OVER (PARTITION BY ass.category_id ORDER BY ass.date)::decimal(12,2) as assignments_cum, - COALESCE(tra.amount, 0)::decimal(12,2) as transactions, SUM(tra.amount) OVER (PARTITION BY tra.category_id ORDER BY tra.date)::decimal(12,2) as transactions_cum + COALESCE(ass.amount, 0)::decimal(12,2) as assignments, + COALESCE(tra.amount, 0)::decimal(12,2) as transactions FROM assignments_by_month as ass FULL OUTER JOIN transactions_by_month as tra ON ass.date = tra.date AND ass.category_id = tra.category_id WHERE (ass.budget_id IS NULL OR ass.budget_id = $1) AND (tra.budget_id IS NULL OR tra.budget_id = $1) -ORDER BY COALESCE(ass.date, tra.date), COALESCE(ass.category_id, tra.category_id) +ORDER BY COALESCE(ass.date, tra.date), COALESCE(ass.amount, tra.amount) ` type GetCumultativeBalancesRow struct { - Date time.Time - CategoryID uuid.UUID - Assignments numeric.Numeric - AssignmentsCum numeric.Numeric - Transactions numeric.Numeric - TransactionsCum numeric.Numeric + Date time.Time + CategoryID uuid.UUID + Assignments numeric.Numeric + Transactions numeric.Numeric } func (q *Queries) GetCumultativeBalances(ctx context.Context, budgetID uuid.UUID) ([]GetCumultativeBalancesRow, error) { @@ -43,9 +41,7 @@ func (q *Queries) GetCumultativeBalances(ctx context.Context, budgetID uuid.UUID &i.Date, &i.CategoryID, &i.Assignments, - &i.AssignmentsCum, &i.Transactions, - &i.TransactionsCum, ); err != nil { return nil, err } diff --git a/postgres/queries/cumultative-balances.sql b/postgres/queries/cumultative-balances.sql index 5ba6f72..cc22480 100644 --- a/postgres/queries/cumultative-balances.sql +++ b/postgres/queries/cumultative-balances.sql @@ -1,8 +1,8 @@ -- name: GetCumultativeBalances :many SELECT COALESCE(ass.date, tra.date), COALESCE(ass.category_id, tra.category_id), - COALESCE(ass.amount, 0)::decimal(12,2) as assignments, SUM(ass.amount) OVER (PARTITION BY ass.category_id ORDER BY ass.date)::decimal(12,2) as assignments_cum, - COALESCE(tra.amount, 0)::decimal(12,2) as transactions, SUM(tra.amount) OVER (PARTITION BY tra.category_id ORDER BY tra.date)::decimal(12,2) as transactions_cum + COALESCE(ass.amount, 0)::decimal(12,2) as assignments, + COALESCE(tra.amount, 0)::decimal(12,2) as transactions FROM assignments_by_month as ass FULL OUTER JOIN transactions_by_month as tra ON ass.date = tra.date AND ass.category_id = tra.category_id WHERE (ass.budget_id IS NULL OR ass.budget_id = @budget_id) AND (tra.budget_id IS NULL OR tra.budget_id = @budget_id) -ORDER BY COALESCE(ass.date, tra.date), COALESCE(ass.category_id, tra.category_id); \ No newline at end of file +ORDER BY COALESCE(ass.date, tra.date), COALESCE(ass.amount, tra.amount); \ No newline at end of file