From 73fa27c88afd3481b323fd57aae099ea3d0f6d29 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Mon, 14 Mar 2022 19:59:30 +0000 Subject: [PATCH 1/2] Make search queries case insensitive --- postgres/accounts.sql.go | 2 +- postgres/categories.sql.go | 2 +- postgres/payees.sql.go | 2 +- postgres/queries/accounts.sql | 2 +- postgres/queries/categories.sql | 2 +- postgres/queries/payees.sql | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/postgres/accounts.sql.go b/postgres/accounts.sql.go index ab5de4e..1d82312 100644 --- a/postgres/accounts.sql.go +++ b/postgres/accounts.sql.go @@ -149,7 +149,7 @@ const searchAccounts = `-- name: SearchAccounts :many SELECT accounts.id, accounts.budget_id, accounts.name, 'account' as type FROM accounts WHERE accounts.budget_id = $1 AND accounts.is_open = TRUE -AND accounts.name LIKE $2 +AND accounts.name ILIKE $2 ORDER BY accounts.name ` diff --git a/postgres/categories.sql.go b/postgres/categories.sql.go index fbf295e..d8cc4e1 100644 --- a/postgres/categories.sql.go +++ b/postgres/categories.sql.go @@ -122,7 +122,7 @@ SELECT CONCAT(category_groups.name, ' : ', categories.name) as name, categories. FROM categories INNER JOIN category_groups ON categories.category_group_id = category_groups.id WHERE category_groups.budget_id = $1 -AND categories.name LIKE $2 +AND categories.name ILIKE $2 ORDER BY category_groups.name, categories.name ` diff --git a/postgres/payees.sql.go b/postgres/payees.sql.go index 446097f..005562d 100644 --- a/postgres/payees.sql.go +++ b/postgres/payees.sql.go @@ -60,7 +60,7 @@ func (q *Queries) GetPayees(ctx context.Context, budgetID uuid.UUID) ([]Payee, e const searchPayees = `-- name: SearchPayees :many SELECT payees.id, payees.budget_id, payees.name, 'payee' as type FROM payees WHERE payees.budget_id = $1 -AND payees.name LIKE $2 +AND payees.name ILIKE $2 ORDER BY payees.name ` diff --git a/postgres/queries/accounts.sql b/postgres/queries/accounts.sql index 0e62900..9309794 100644 --- a/postgres/queries/accounts.sql +++ b/postgres/queries/accounts.sql @@ -29,7 +29,7 @@ ORDER BY accounts.name; SELECT accounts.id, accounts.budget_id, accounts.name, 'account' as type FROM accounts WHERE accounts.budget_id = @budget_id AND accounts.is_open = TRUE -AND accounts.name LIKE @search +AND accounts.name ILIKE @search ORDER BY accounts.name; -- name: UpdateAccount :one diff --git a/postgres/queries/categories.sql b/postgres/queries/categories.sql index fb507af..62e421b 100644 --- a/postgres/queries/categories.sql +++ b/postgres/queries/categories.sql @@ -25,6 +25,6 @@ SELECT CONCAT(category_groups.name, ' : ', categories.name) as name, categories. FROM categories INNER JOIN category_groups ON categories.category_group_id = category_groups.id WHERE category_groups.budget_id = @budget_id -AND categories.name LIKE @search +AND categories.name ILIKE @search ORDER BY category_groups.name, categories.name; --ORDER BY levenshtein(payees.name, $2); \ No newline at end of file diff --git a/postgres/queries/payees.sql b/postgres/queries/payees.sql index ed38a5f..5795185 100644 --- a/postgres/queries/payees.sql +++ b/postgres/queries/payees.sql @@ -12,6 +12,6 @@ ORDER BY name; -- name: SearchPayees :many SELECT payees.*, 'payee' as type FROM payees WHERE payees.budget_id = @budget_id -AND payees.name LIKE @search +AND payees.name ILIKE @search ORDER BY payees.name; --ORDER BY levenshtein(payees.name, $2); \ No newline at end of file -- 2.47.2 From efde504603108ba02dbc14c8b9bd646537d83ad1 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Mon, 14 Mar 2022 20:00:00 +0000 Subject: [PATCH 2/2] Hide hidden categories from searchresults --- postgres/categories.sql.go | 1 + postgres/queries/categories.sql | 1 + 2 files changed, 2 insertions(+) diff --git a/postgres/categories.sql.go b/postgres/categories.sql.go index d8cc4e1..d31dd18 100644 --- a/postgres/categories.sql.go +++ b/postgres/categories.sql.go @@ -123,6 +123,7 @@ FROM categories INNER JOIN category_groups ON categories.category_group_id = category_groups.id WHERE category_groups.budget_id = $1 AND categories.name ILIKE $2 +AND category_groups.name != 'Hidden Categories' ORDER BY category_groups.name, categories.name ` diff --git a/postgres/queries/categories.sql b/postgres/queries/categories.sql index 62e421b..d9c4843 100644 --- a/postgres/queries/categories.sql +++ b/postgres/queries/categories.sql @@ -26,5 +26,6 @@ FROM categories INNER JOIN category_groups ON categories.category_group_id = category_groups.id WHERE category_groups.budget_id = @budget_id AND categories.name ILIKE @search +AND category_groups.name != 'Hidden Categories' ORDER BY category_groups.name, categories.name; --ORDER BY levenshtein(payees.name, $2); \ No newline at end of file -- 2.47.2