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/media/getfile_test.go | 6 +++---
 internal/processing/media/unattach.go     | 2 +-
 internal/processing/media/update.go       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'internal/processing/media')

diff --git a/internal/processing/media/getfile_test.go b/internal/processing/media/getfile_test.go
index a8a3568e7..6e5271607 100644
--- a/internal/processing/media/getfile_test.go
+++ b/internal/processing/media/getfile_test.go
@@ -69,7 +69,7 @@ func (suite *GetFileTestSuite) TestGetRemoteFileUncached() {
 	// uncache the file from local
 	testAttachment := suite.testAttachments["remote_account_1_status_1_attachment_1"]
 	testAttachment.Cached = testrig.FalseBool()
-	err := suite.db.UpdateByPrimaryKey(ctx, testAttachment, "cached")
+	err := suite.db.UpdateByID(ctx, testAttachment, testAttachment.ID, "cached")
 	suite.NoError(err)
 	err = suite.storage.Delete(ctx, testAttachment.File.Path)
 	suite.NoError(err)
@@ -124,7 +124,7 @@ func (suite *GetFileTestSuite) TestGetRemoteFileUncachedInterrupted() {
 	// uncache the file from local
 	testAttachment := suite.testAttachments["remote_account_1_status_1_attachment_1"]
 	testAttachment.Cached = testrig.FalseBool()
-	err := suite.db.UpdateByPrimaryKey(ctx, testAttachment, "cached")
+	err := suite.db.UpdateByID(ctx, testAttachment, testAttachment.ID, "cached")
 	suite.NoError(err)
 	err = suite.storage.Delete(ctx, testAttachment.File.Path)
 	suite.NoError(err)
@@ -179,7 +179,7 @@ func (suite *GetFileTestSuite) TestGetRemoteFileThumbnailUncached() {
 
 	// uncache the file from local
 	testAttachment.Cached = testrig.FalseBool()
-	err = suite.db.UpdateByPrimaryKey(ctx, testAttachment, "cached")
+	err = suite.db.UpdateByID(ctx, testAttachment, testAttachment.ID, "cached")
 	suite.NoError(err)
 	err = suite.storage.Delete(ctx, testAttachment.File.Path)
 	suite.NoError(err)
diff --git a/internal/processing/media/unattach.go b/internal/processing/media/unattach.go
index 5ef8f81f4..d0f34eba1 100644
--- a/internal/processing/media/unattach.go
+++ b/internal/processing/media/unattach.go
@@ -47,7 +47,7 @@ func (p *processor) Unattach(ctx context.Context, account *gtsmodel.Account, med
 	attachment.UpdatedAt = time.Now()
 	attachment.StatusID = ""
 
-	if err := p.db.UpdateByPrimaryKey(ctx, attachment, updatingColumns...); err != nil {
+	if err := p.db.UpdateByID(ctx, attachment, attachment.ID, updatingColumns...); err != nil {
 		return nil, gtserror.NewErrorNotFound(fmt.Errorf("db error updating attachment: %s", err))
 	}
 
diff --git a/internal/processing/media/update.go b/internal/processing/media/update.go
index b8177eeb4..e0833a511 100644
--- a/internal/processing/media/update.go
+++ b/internal/processing/media/update.go
@@ -61,7 +61,7 @@ func (p *processor) Update(ctx context.Context, account *gtsmodel.Account, media
 		updatingColumns = append(updatingColumns, "focus_x", "focus_y")
 	}
 
-	if err := p.db.UpdateByPrimaryKey(ctx, attachment, updatingColumns...); err != nil {
+	if err := p.db.UpdateByID(ctx, attachment, attachment.ID, updatingColumns...); err != nil {
 		return nil, gtserror.NewErrorInternalError(fmt.Errorf("database error updating media: %s", err))
 	}
 
-- 
cgit v1.2.3