summaryrefslogtreecommitdiff
path: root/internal/db
diff options
context:
space:
mode:
Diffstat (limited to 'internal/db')
-rw-r--r--internal/db/bundb/bundb.go2
-rw-r--r--internal/db/bundb/conn.go2
-rw-r--r--internal/db/bundb/migrations/20220214175650_media_cleanup/mediaattachment.go2
-rw-r--r--internal/db/bundb/migrations/20220315160814_admin_account_actions/mediaattachment.go2
-rw-r--r--internal/db/bundb/util.go4
5 files changed, 6 insertions, 6 deletions
diff --git a/internal/db/bundb/bundb.go b/internal/db/bundb/bundb.go
index 2fc65364f..1579fae76 100644
--- a/internal/db/bundb/bundb.go
+++ b/internal/db/bundb/bundb.go
@@ -282,7 +282,7 @@ func sqliteConn(ctx context.Context) (*DBConn, error) {
}
func pgConn(ctx context.Context) (*DBConn, error) {
- opts, err := deriveBunDBPGOptions()
+ opts, err := deriveBunDBPGOptions() //nolint:contextcheck
if err != nil {
return nil, fmt.Errorf("could not create bundb postgres options: %s", err)
}
diff --git a/internal/db/bundb/conn.go b/internal/db/bundb/conn.go
index 1c85f6f6f..2f2dfbe9f 100644
--- a/internal/db/bundb/conn.go
+++ b/internal/db/bundb/conn.go
@@ -55,7 +55,7 @@ func (conn *DBConn) RunInTx(ctx context.Context, fn func(bun.Tx) error) db.Error
}
// Finally, commit
- err = tx.Commit()
+ err = tx.Commit() //nolint:contextcheck
done = true
return err
}())
diff --git a/internal/db/bundb/migrations/20220214175650_media_cleanup/mediaattachment.go b/internal/db/bundb/migrations/20220214175650_media_cleanup/mediaattachment.go
index a2f0b5f29..7081c730b 100644
--- a/internal/db/bundb/migrations/20220214175650_media_cleanup/mediaattachment.go
+++ b/internal/db/bundb/migrations/20220214175650_media_cleanup/mediaattachment.go
@@ -30,7 +30,7 @@ type MediaAttachment struct {
URL string `validate:"required_without=RemoteURL,omitempty,url" bun:",nullzero"` // Where can the attachment be retrieved on *this* server
RemoteURL string `validate:"required_without=URL,omitempty,url" bun:",nullzero"` // Where can the attachment be retrieved on a remote server (empty for local media)
Type FileType `validate:"oneof=Image Gif Audio Video Unknown" bun:",nullzero,notnull"` // Type of file (image/gif/audio/video)
- FileMeta FileMeta `validate:"required" bun:",embed:filemeta_,nullzero,notnull"` // Metadata about the file
+ FileMeta FileMeta `validate:"required" bun:",embed:,nullzero,notnull"` // Metadata about the file
AccountID string `validate:"required,ulid" bun:"type:CHAR(26),nullzero,notnull"` // To which account does this attachment belong
Account *Account `validate:"-" bun:"rel:has-one"` // Account corresponding to accountID
Description string `validate:"-" bun:""` // Description of the attachment (for screenreaders)
diff --git a/internal/db/bundb/migrations/20220315160814_admin_account_actions/mediaattachment.go b/internal/db/bundb/migrations/20220315160814_admin_account_actions/mediaattachment.go
index 20cc6d3bf..b29d718ad 100644
--- a/internal/db/bundb/migrations/20220315160814_admin_account_actions/mediaattachment.go
+++ b/internal/db/bundb/migrations/20220315160814_admin_account_actions/mediaattachment.go
@@ -32,7 +32,7 @@ type MediaAttachment struct {
URL string `validate:"required_without=RemoteURL,omitempty,url" bun:",nullzero"` // Where can the attachment be retrieved on *this* server
RemoteURL string `validate:"required_without=URL,omitempty,url" bun:",nullzero"` // Where can the attachment be retrieved on a remote server (empty for local media)
Type FileType `validate:"oneof=Image Gif Audio Video Unknown" bun:",nullzero,notnull"` // Type of file (image/gif/audio/video)
- FileMeta FileMeta `validate:"required" bun:",embed:filemeta_,nullzero,notnull"` // Metadata about the file
+ FileMeta FileMeta `validate:"required" bun:",embed:,nullzero,notnull"` // Metadata about the file
AccountID string `validate:"required,ulid" bun:"type:CHAR(26),nullzero,notnull"` // To which account does this attachment belong
Account *Account `validate:"-" bun:"rel:has-one"` // Account corresponding to accountID
Description string `validate:"-" bun:""` // Description of the attachment (for screenreaders)
diff --git a/internal/db/bundb/util.go b/internal/db/bundb/util.go
index 34a988472..434d12f32 100644
--- a/internal/db/bundb/util.go
+++ b/internal/db/bundb/util.go
@@ -28,7 +28,7 @@ import (
//
// Use it as follows:
//
-// q = q.WhereGroup(" AND ", whereEmptyOrNull("whatever_column"))
+// q = q.WhereGroup(" AND ", whereEmptyOrNull("whatever_column"))
func whereEmptyOrNull(column string) func(*bun.SelectQuery) *bun.SelectQuery {
return func(q *bun.SelectQuery) *bun.SelectQuery {
return q.
@@ -42,7 +42,7 @@ func whereEmptyOrNull(column string) func(*bun.SelectQuery) *bun.SelectQuery {
//
// Use it as follows:
//
-// q = q.WhereGroup(" AND ", whereNotEmptyAndNotNull("whatever_column"))
+// q = q.WhereGroup(" AND ", whereNotEmptyAndNotNull("whatever_column"))
func whereNotEmptyAndNotNull(column string) func(*bun.SelectQuery) *bun.SelectQuery {
return func(q *bun.SelectQuery) *bun.SelectQuery {
return q.