mirrors
/
gotosocial
mirror of
1
Fork 0
Code Issues Releases Activity

fix broken GetInstanceAccount selector (#311) 

* fix broken GetInstanceAccount selector

* patch tests
This commit is contained in:
tobi 2021-11-17 14:40:39 +01:00 committed by GitHub
parent ff7c96caa3
commit f3e36de78a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/db/bundb/account.go
View File

@ -127,13 +127,13 @@ func (a *accountDB) GetInstanceAccount(ctx context.Context, domain string) (*gts
q := a.newAccountQ(account) q := a.newAccountQ(account)
if domain == "" { if domain != "" {
q = q. q = q.
Where("account.username = ?", domain). Where("account.username = ?", domain).
Where("account.domain = ?", domain) Where("account.domain = ?", domain)
} else { } else {
q = q. q = q.
Where("account.username = ?", domain). Where("account.username = ?", a.config.Host).
WhereGroup(" AND ", whereEmptyOrNull("domain")) WhereGroup(" AND ", whereEmptyOrNull("domain"))
} }

4
internal/db/bundb/admin_test.go
View File

@ -37,7 +37,7 @@ func (suite *AdminTestSuite) TestCreateInstanceAccount() {
testrig.CreateTestTables(suite.db) testrig.CreateTestTables(suite.db)
// make sure there's no instance account in the db yet // make sure there's no instance account in the db yet
acct, err := suite.db.GetInstanceAccount(context.Background(), suite.config.Host) acct, err := suite.db.GetInstanceAccount(context.Background(), "")
suite.Error(err) suite.Error(err)
suite.Nil(acct) suite.Nil(acct)
@ -46,7 +46,7 @@ func (suite *AdminTestSuite) TestCreateInstanceAccount() {
suite.NoError(err) suite.NoError(err)
// and now check it exists // and now check it exists
acct, err = suite.db.GetInstanceAccount(context.Background(), suite.config.Host) acct, err = suite.db.GetInstanceAccount(context.Background(), "")
suite.NoError(err) suite.NoError(err)
suite.NotNil(acct) suite.NotNil(acct)
} }