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/session_test.go | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

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

diff --git a/internal/db/bundb/session_test.go b/internal/db/bundb/session_test.go
index ef508bde8..1e7fde5aa 100644
--- a/internal/db/bundb/session_test.go
+++ b/internal/db/bundb/session_test.go
@@ -37,14 +37,13 @@ func (suite *SessionTestSuite) TestGetSession() {
 	suite.NotEmpty(session.Crypt)
 	suite.NotEmpty(session.ID)
 
-	// TODO -- the same session should be returned with consecutive selects
-	// right now there's an issue with bytea in bun, so uncomment this when that issue is fixed: https://github.com/uptrace/bun/issues/122
-	// session2, err := suite.db.GetSession(context.Background())
-	// suite.NoError(err)
-	// suite.NotNil(session2)
-	// suite.Equal(session.Auth, session2.Auth)
-	// suite.Equal(session.Crypt, session2.Crypt)
-	// suite.Equal(session.ID, session2.ID)
+	// the same session should be returned with consecutive selects
+	session2, err := suite.db.GetSession(context.Background())
+	suite.NoError(err)
+	suite.NotNil(session2)
+	suite.Equal(session.Auth, session2.Auth)
+	suite.Equal(session.Crypt, session2.Crypt)
+	suite.Equal(session.ID, session2.ID)
 }
 
 func TestSessionTestSuite(t *testing.T) {
-- 
cgit v1.2.3