gtsocial-umbx

commit 2385b51d5851195f6c418e72c35d1526519f23b0
parent 5864954e2ea6e9ef944f04b101f2c388df990d2a
Author: tobi <31960611+tsmethurst@users.noreply.github.com>
Date:   Fri, 10 Jun 2022 10:56:49 +0200

[bugfix] Make accounts media_only query also work with pg (#643)


Diffstat:
M
internal/db/bundb/account.go
 | 
26
+++++++++++++++++++-------
M
internal/db/bundb/account_test.go
 | 
6
++++++
M
internal/db/bundb/bundbnew_test.go
 | 
1
+

3 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/internal/db/bundb/account.go b/internal/db/bundb/account.go
@@ -25,11 +25,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/sirupsen/logrus"
 	"github.com/superseriousbusiness/gotosocial/internal/cache"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 	"github.com/uptrace/bun"
+	"github.com/uptrace/bun/dialect"
 )
 
 type accountDB struct {
@@ -268,14 +270,24 @@ func (a *accountDB) GetAccountStatuses(ctx context.Context, accountID string, li
 	if mediaOnly {
 		// attachments are stored as a json object;
 		// this implementation differs between sqlite and postgres,
-		// so we have to be very thorough to cover all eventualities
+		// so we have to be thorough to cover all eventualities
 		q = q.WhereGroup(" AND ", func(q *bun.SelectQuery) *bun.SelectQuery {
-			return q.
-				Where("? IS NOT NULL", bun.Ident("attachments")).
-				Where("? != ''", bun.Ident("attachments")).
-				Where("? != 'null'", bun.Ident("attachments")).
-				Where("? != '{}'", bun.Ident("attachments")).
-				Where("? != '[]'", bun.Ident("attachments"))
+			switch a.conn.Dialect().Name() {
+			case dialect.PG:
+				return q.
+					Where("? IS NOT NULL", bun.Ident("attachments")).
+					Where("? != '{}'", bun.Ident("attachments"))
+			case dialect.SQLite:
+				return q.
+					Where("? IS NOT NULL", bun.Ident("attachments")).
+					Where("? != ''", bun.Ident("attachments")).
+					Where("? != 'null'", bun.Ident("attachments")).
+					Where("? != '{}'", bun.Ident("attachments")).
+					Where("? != '[]'", bun.Ident("attachments"))
+			default:
+				logrus.Panic("db dialect was neither pg nor sqlite")
+				return q
+			}
 		})
 	}
 
diff --git a/internal/db/bundb/account_test.go b/internal/db/bundb/account_test.go
@@ -40,6 +40,12 @@ func (suite *AccountTestSuite) TestGetAccountStatuses() {
 	suite.Len(statuses, 5)
 }
 
+func (suite *AccountTestSuite) TestGetAccountStatusesMediaOnly() {
+	statuses, err := suite.db.GetAccountStatuses(context.Background(), suite.testAccounts["local_account_1"].ID, 20, false, false, "", "", false, true, false)
+	suite.NoError(err)
+	suite.Len(statuses, 1)
+}
+
 func (suite *AccountTestSuite) TestGetAccountByIDWithExtras() {
 	account, err := suite.db.GetAccountByID(context.Background(), suite.testAccounts["local_account_1"].ID)
 	if err != nil {
diff --git a/internal/db/bundb/bundbnew_test.go b/internal/db/bundb/bundbnew_test.go
@@ -41,6 +41,7 @@ func (suite *BundbNewTestSuite) TestCreateNewDB() {
 func (suite *BundbNewTestSuite) TestCreateNewSqliteDBNoAddress() {
 	// create a new db with no address specified
 	config.SetDbAddress("")
+	config.SetDbType("sqlite")
 	db, err := bundb.NewBunDBService(context.Background())
 	suite.EqualError(err, "'db-address' was not set when attempting to start sqlite")
 	suite.Nil(db)