From aa07750bdb4dacdb1be39d765114915bba3fc29f Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Sat, 8 Oct 2022 13:50:48 +0200
Subject: [chore] Standardize database queries, use `bun.Ident()` properly
 (#886)

* use bun.Ident for user queries

* use bun.Ident for account queries

* use bun.Ident for media queries

* add DeleteAccount func

* remove CaseInsensitive in Where+use Ident ipv Safe

* update admin db

* update domain, use ident

* update emoji, use ident

* update instance queries, use bun.Ident

* fix media

* update mentions, use bun ident

* update relationship + tests

* use tableexpr

* add test follows to bun db test suite

* update notifications

* updatebyprimarykey => updatebyid

* fix session

* prefer explicit ID to pk

* fix little fucky wucky

* remove workaround

* use proper db func for attachment selection

* update status db

* add m2m entries in test rig

* fix up timeline

* go fmt

* fix status put issue

* update GetAccountStatuses
---
 internal/db/bundb/basic.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'internal/db/bundb/basic.go')

diff --git a/internal/db/bundb/basic.go b/internal/db/bundb/basic.go
index cd80c9330..ef8b35574 100644
--- a/internal/db/bundb/basic.go
+++ b/internal/db/bundb/basic.go
@@ -94,12 +94,12 @@ func (b *basicDB) DeleteWhere(ctx context.Context, where []db.Where, i interface
 	return b.conn.ProcessError(err)
 }
 
-func (b *basicDB) UpdateByPrimaryKey(ctx context.Context, i interface{}, columns ...string) db.Error {
+func (b *basicDB) UpdateByID(ctx context.Context, i interface{}, id string, columns ...string) db.Error {
 	q := b.conn.
 		NewUpdate().
 		Model(i).
 		Column(columns...).
-		WherePK()
+		Where("? = ?", bun.Ident("id"), id)
 
 	_, err := q.Exec(ctx)
 	return b.conn.ProcessError(err)
@@ -110,7 +110,7 @@ func (b *basicDB) UpdateWhere(ctx context.Context, where []db.Where, key string,
 
 	updateWhere(q, where)
 
-	q = q.Set("? = ?", bun.Safe(key), value)
+	q = q.Set("? = ?", bun.Ident(key), value)
 
 	_, err := q.Exec(ctx)
 	return b.conn.ProcessError(err)
-- 
cgit v1.2.3