summaryrefslogtreecommitdiff
path: root/internal/db/bundb/media.go
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2022-10-08 13:50:48 +0200
committerLibravatar GitHub <noreply@github.com>2022-10-08 13:50:48 +0200
commitaa07750bdb4dacdb1be39d765114915bba3fc29f (patch)
tree30e9e5052f607f8c8e4f7d518559df8706275e0f /internal/db/bundb/media.go
parent[performance] cache domains after max retries in transport (#884) (diff)
downloadgotosocial-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 'internal/db/bundb/media.go')
-rw-r--r--internal/db/bundb/media.go30
1 files changed, 15 insertions, 15 deletions
diff --git a/internal/db/bundb/media.go b/internal/db/bundb/media.go
index 71433b901..39e0ad0e3 100644
--- a/internal/db/bundb/media.go
+++ b/internal/db/bundb/media.go
@@ -42,7 +42,7 @@ func (m *mediaDB) GetAttachmentByID(ctx context.Context, id string) (*gtsmodel.M
attachment := &gtsmodel.MediaAttachment{}
q := m.newMediaQ(attachment).
- Where("media_attachment.id = ?", id)
+ Where("? = ?", bun.Ident("media_attachment.id"), id)
if err := q.Scan(ctx); err != nil {
return nil, m.conn.ProcessError(err)
@@ -56,10 +56,10 @@ func (m *mediaDB) GetRemoteOlderThan(ctx context.Context, olderThan time.Time, l
q := m.conn.
NewSelect().
Model(&attachments).
- Where("media_attachment.cached = true").
- Where("media_attachment.avatar = false").
- Where("media_attachment.header = false").
- Where("media_attachment.created_at < ?", olderThan).
+ Where("? = ?", bun.Ident("media_attachment.cached"), true).
+ Where("? = ?", bun.Ident("media_attachment.avatar"), false).
+ Where("? = ?", bun.Ident("media_attachment.header"), false).
+ Where("? < ?", bun.Ident("media_attachment.created_at"), olderThan).
WhereGroup(" AND ", whereNotEmptyAndNotNull("media_attachment.remote_url")).
Order("media_attachment.created_at DESC")
@@ -79,13 +79,13 @@ func (m *mediaDB) GetAvatarsAndHeaders(ctx context.Context, maxID string, limit
q := m.newMediaQ(&attachments).
WhereGroup(" AND ", func(innerQ *bun.SelectQuery) *bun.SelectQuery {
return innerQ.
- WhereOr("media_attachment.avatar = true").
- WhereOr("media_attachment.header = true")
+ WhereOr("? = ?", bun.Ident("media_attachment.avatar"), true).
+ WhereOr("? = ?", bun.Ident("media_attachment.header"), true)
}).
Order("media_attachment.id DESC")
if maxID != "" {
- q = q.Where("media_attachment.id < ?", maxID)
+ q = q.Where("? < ?", bun.Ident("media_attachment.id"), maxID)
}
if limit != 0 {
@@ -103,15 +103,15 @@ func (m *mediaDB) GetLocalUnattachedOlderThan(ctx context.Context, olderThan tim
attachments := []*gtsmodel.MediaAttachment{}
q := m.newMediaQ(&attachments).
- Where("media_attachment.cached = true").
- Where("media_attachment.avatar = false").
- Where("media_attachment.header = false").
- Where("media_attachment.created_at < ?", olderThan).
- Where("media_attachment.remote_url IS NULL").
- Where("media_attachment.status_id IS NULL")
+ Where("? = ?", bun.Ident("media_attachment.cached"), true).
+ Where("? = ?", bun.Ident("media_attachment.avatar"), false).
+ Where("? = ?", bun.Ident("media_attachment.header"), false).
+ Where("? < ?", bun.Ident("media_attachment.created_at"), olderThan).
+ Where("? IS NULL", bun.Ident("media_attachment.remote_url")).
+ Where("? IS NULL", bun.Ident("media_attachment.status_id"))
if maxID != "" {
- q = q.Where("media_attachment.id < ?", maxID)
+ q = q.Where("? < ?", bun.Ident("media_attachment.id"), maxID)
}
if limit != 0 {