jacob1123/budgeteer
1
1
Fork 0
Code Issues 12 Pull Requests 1 Packages Releases 1 Wiki Activity

Fix joins

Browse Source
This commit is contained in:
Jan Bader 2021-12-06 21:18:29 +00:00
parent 16b59afc29
commit 82045ceed7
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
postgres/queries/transactions.sql
View File

@ -6,22 +6,24 @@ RETURNING *;
-- name: GetTransactionsForBudget :many -- name: GetTransactionsForBudget :many
SELECT transactions.id, transactions.date, transactions.memo, transactions.amount, SELECT transactions.id, transactions.date, transactions.memo, transactions.amount,
accounts.name as account, payees.name as payee accounts.name as account, COALESCE(payees.name, '') as payee, COALESCE(category_groups.name, '') as category_group, COALESCE(categories.name, '') as category
FROM transactions FROM transactions
INNER JOIN accounts ON accounts.id = transactions.account_id INNER JOIN accounts ON accounts.id = transactions.account_id
INNER JOIN payees ON payees.id = transactions.payee_id LEFT JOIN payees ON payees.id = transactions.payee_id
LEFT JOIN categories ON categories.id = transactions.category_id
LEFT JOIN category_groups ON category_groups.id = categories.category_group_id
WHERE accounts.budget_id = $1 WHERE accounts.budget_id = $1
ORDER BY transactions.date DESC ORDER BY transactions.date DESC
LIMIT 200; LIMIT 200;
-- name: GetTransactionsForAccount :many -- name: GetTransactionsForAccount :many
SELECT transactions.id, transactions.date, transactions.memo, transactions.amount, SELECT transactions.id, transactions.date, transactions.memo, transactions.amount,
accounts.name as account, payees.name as payee, category_groups.name as category_group, categories.name as category accounts.name as account, COALESCE(payees.name, '') as payee, COALESCE(category_groups.name, '') as category_group, COALESCE(categories.name, '') as category
FROM transactions FROM transactions
INNER JOIN accounts ON accounts.id = transactions.account_id INNER JOIN accounts ON accounts.id = transactions.account_id
INNER JOIN payees ON payees.id = transactions.payee_id LEFT JOIN payees ON payees.id = transactions.payee_id
INNER JOIN categories ON categories.id = transactions.category_id LEFT JOIN categories ON categories.id = transactions.category_id
INNER JOIN category_groups ON category_groups.id = categories.category_group_id LEFT JOIN category_groups ON category_groups.id = categories.category_group_id
WHERE transactions.account_id = $1 WHERE transactions.account_id = $1
ORDER BY transactions.date DESC ORDER BY transactions.date DESC
LIMIT 200; LIMIT 200;

18
postgres/transactions.sql.go
View File

@ -50,12 +50,12 @@ func (q *Queries) CreateTransaction(ctx context.Context, arg CreateTransactionPa
const getTransactionsForAccount = `-- name: GetTransactionsForAccount :many const getTransactionsForAccount = `-- name: GetTransactionsForAccount :many
SELECT transactions.id, transactions.date, transactions.memo, transactions.amount, SELECT transactions.id, transactions.date, transactions.memo, transactions.amount,
accounts.name as account, payees.name as payee, category_groups.name as category_group, categories.name as category accounts.name as account, COALESCE(payees.name, '') as payee, COALESCE(category_groups.name, '') as category_group, COALESCE(categories.name, '') as category
FROM transactions FROM transactions
INNER JOIN accounts ON accounts.id = transactions.account_id INNER JOIN accounts ON accounts.id = transactions.account_id
INNER JOIN payees ON payees.id = transactions.payee_id LEFT JOIN payees ON payees.id = transactions.payee_id
INNER JOIN categories ON categories.id = transactions.category_id LEFT JOIN categories ON categories.id = transactions.category_id
INNER JOIN category_groups ON category_groups.id = categories.category_group_id LEFT JOIN category_groups ON category_groups.id = categories.category_group_id
WHERE transactions.account_id = $1 WHERE transactions.account_id = $1
ORDER BY transactions.date DESC ORDER BY transactions.date DESC
LIMIT 200 LIMIT 200
@ -106,10 +106,12 @@ func (q *Queries) GetTransactionsForAccount(ctx context.Context, accountID uuid.
const getTransactionsForBudget = `-- name: GetTransactionsForBudget :many const getTransactionsForBudget = `-- name: GetTransactionsForBudget :many
SELECT transactions.id, transactions.date, transactions.memo, transactions.amount, SELECT transactions.id, transactions.date, transactions.memo, transactions.amount,
accounts.name as account, payees.name as payee accounts.name as account, COALESCE(payees.name, '') as payee, COALESCE(category_groups.name, '') as category_group, COALESCE(categories.name, '') as category
FROM transactions FROM transactions
INNER JOIN accounts ON accounts.id = transactions.account_id INNER JOIN accounts ON accounts.id = transactions.account_id
INNER JOIN payees ON payees.id = transactions.payee_id LEFT JOIN payees ON payees.id = transactions.payee_id
LEFT JOIN categories ON categories.id = transactions.category_id
LEFT JOIN category_groups ON category_groups.id = categories.category_group_id
WHERE accounts.budget_id = $1 WHERE accounts.budget_id = $1
ORDER BY transactions.date DESC ORDER BY transactions.date DESC
LIMIT 200 LIMIT 200
@ -122,6 +124,8 @@ type GetTransactionsForBudgetRow struct {
Amount Numeric Amount Numeric
Account string Account string
Payee string Payee string
CategoryGroup string
Category string
} }
func (q *Queries) GetTransactionsForBudget(ctx context.Context, budgetID uuid.UUID) ([]GetTransactionsForBudgetRow, error) { func (q *Queries) GetTransactionsForBudget(ctx context.Context, budgetID uuid.UUID) ([]GetTransactionsForBudgetRow, error) {
@ -140,6 +144,8 @@ func (q *Queries) GetTransactionsForBudget(ctx context.Context, budgetID uuid.UU
&i.Amount, &i.Amount,
&i.Account, &i.Account,
&i.Payee, &i.Payee,
&i.CategoryGroup,
&i.Category,
); err != nil { ); err != nil {
return nil, err return nil, err
} }