mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-29 07:22:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[chore] Standardize database queries, use bun.Ident() properly (#886)

Browse source 
* 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
This commit is contained in:
tobi 2022-10-08 13:50:48 +02:00 • committed by GitHub
commit aa07750bdb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
45 changed files with 1074 additions and 570 deletions
Download patch file Download diff file Expand all files Collapse all files

14
testrig/db.go
View file

@ -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)

18
testrig/testmodels.go
View file

@ -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{