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/processing/user/emailconfirm_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'internal/processing/user/emailconfirm_test.go')

diff --git a/internal/processing/user/emailconfirm_test.go b/internal/processing/user/emailconfirm_test.go
index 87aff9756..4e31a3646 100644
--- a/internal/processing/user/emailconfirm_test.go
+++ b/internal/processing/user/emailconfirm_test.go
@@ -74,7 +74,7 @@ func (suite *EmailConfirmTestSuite) TestConfirmEmail() {
 	user.ConfirmationSentAt = time.Now().Add(-5 * time.Minute)
 	user.ConfirmationToken = "1d1aa44b-afa4-49c8-ac4b-eceb61715cc6"
 
-	err := suite.db.UpdateByPrimaryKey(ctx, user, updatingColumns...)
+	err := suite.db.UpdateByID(ctx, user, user.ID, updatingColumns...)
 	suite.NoError(err)
 
 	// confirm with the token set above
@@ -102,7 +102,7 @@ func (suite *EmailConfirmTestSuite) TestConfirmEmailOldToken() {
 	user.ConfirmationSentAt = time.Now().Add(-192 * time.Hour)
 	user.ConfirmationToken = "1d1aa44b-afa4-49c8-ac4b-eceb61715cc6"
 
-	err := suite.db.UpdateByPrimaryKey(ctx, user, updatingColumns...)
+	err := suite.db.UpdateByID(ctx, user, user.ID, updatingColumns...)
 	suite.NoError(err)
 
 	// confirm with the token set above
-- 
cgit v1.2.3