diff options
author | 2022-10-08 13:50:48 +0200 | |
---|---|---|
committer | 2022-10-08 13:50:48 +0200 | |
commit | aa07750bdb4dacdb1be39d765114915bba3fc29f (patch) | |
tree | 30e9e5052f607f8c8e4f7d518559df8706275e0f /testrig | |
parent | [performance] cache domains after max retries in transport (#884) (diff) | |
download | gotosocial-aa07750bdb4dacdb1be39d765114915bba3fc29f.tar.xz |
[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
Diffstat (limited to 'testrig')
-rw-r--r-- | testrig/db.go | 14 | ||||
-rw-r--r-- | testrig/testmodels.go | 18 |
2 files changed, 31 insertions, 1 deletions
diff --git a/testrig/db.go b/testrig/db.go index 72446e2bc..88237d7d0 100644 --- a/testrig/db.go +++ b/testrig/db.go @@ -187,7 +187,7 @@ func StandardDBSetup(db db.DB, accounts map[string]*gtsmodel.Account) { } for _, v := range NewTestStatuses() { - if err := db.PutStatus(ctx, v); err != nil { + if err := db.Put(ctx, v); err != nil { log.Panic(err) } } @@ -198,12 +198,24 @@ func StandardDBSetup(db db.DB, accounts map[string]*gtsmodel.Account) { } } + for _, v := range NewTestStatusToEmojis() { + if err := db.Put(ctx, v); err != nil { + log.Panic(err) + } + } + for _, v := range NewTestTags() { if err := db.Put(ctx, v); err != nil { log.Panic(err) } } + for _, v := range NewTestStatusToTags() { + if err := db.Put(ctx, v); err != nil { + log.Panic(err) + } + } + for _, v := range NewTestMentions() { if err := db.Put(ctx, v); err != nil { log.Panic(err) diff --git a/testrig/testmodels.go b/testrig/testmodels.go index f53022fd8..054f14323 100644 --- a/testrig/testmodels.go +++ b/testrig/testmodels.go @@ -977,6 +977,15 @@ func NewTestEmojis() map[string]*gtsmodel.Emoji { } } +func NewTestStatusToEmojis() map[string]*gtsmodel.StatusToEmoji { + return map[string]*gtsmodel.StatusToEmoji{ + "admin_account_status_1_rainbow": { + StatusID: "01F8MH75CBF9JFX4ZAD54N0W0R", + EmojiID: "01F8MH9H8E4VG3KDYJR9EGPXCQ", + }, + } +} + func NewTestInstances() map[string]*gtsmodel.Instance { return map[string]*gtsmodel.Instance{ "localhost:8080": { @@ -1540,6 +1549,15 @@ func NewTestTags() map[string]*gtsmodel.Tag { } } +func NewTestStatusToTags() map[string]*gtsmodel.StatusToTag { + return map[string]*gtsmodel.StatusToTag{ + "admin_account_status_1_welcome": { + StatusID: "01F8MH75CBF9JFX4ZAD54N0W0R", + TagID: "01F8MHA1A2NF9MJ3WCCQ3K8BSZ", + }, + } +} + // NewTestMentions returns a map of gts model mentions keyed by their name. func NewTestMentions() map[string]*gtsmodel.Mention { return map[string]*gtsmodel.Mention{ |