diff options
author | 2023-05-12 14:33:40 +0200 | |
---|---|---|
committer | 2023-05-12 14:33:40 +0200 | |
commit | ec325fee141c1e9757144a0a4094061b56839b78 (patch) | |
tree | 2948ab4ef5702cc8478ab2be841340b946bdb867 /vendor/github.com/uptrace/bun/query_base.go | |
parent | [frogend/bugfix] fix dynamicSpoiler elements (#1771) (diff) | |
download | gotosocial-ec325fee141c1e9757144a0a4094061b56839b78.tar.xz |
[chore] Update a bunch of database dependencies (#1772)
* [chore] Update a bunch of database dependencies
* fix lil thing
Diffstat (limited to 'vendor/github.com/uptrace/bun/query_base.go')
-rw-r--r-- | vendor/github.com/uptrace/bun/query_base.go | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/vendor/github.com/uptrace/bun/query_base.go b/vendor/github.com/uptrace/bun/query_base.go index 9df70d1f4..4b3545d0d 100644 --- a/vendor/github.com/uptrace/bun/query_base.go +++ b/vendor/github.com/uptrace/bun/query_base.go @@ -180,13 +180,13 @@ func (q *baseQuery) setErr(err error) { } func (q *baseQuery) getModel(dest []interface{}) (Model, error) { - if len(dest) == 0 { - if q.model != nil { - return q.model, nil - } - return nil, errNilModel + if len(dest) > 0 { + return newModel(q.db, dest) + } + if q.model != nil { + return q.model, nil } - return newModel(q.db, dest) + return nil, errNilModel } func (q *baseQuery) beforeAppendModel(ctx context.Context, query Query) error { @@ -1054,7 +1054,12 @@ type customValueQuery struct { func (q *customValueQuery) addValue( table *schema.Table, column string, value string, args []interface{}, ) { - if _, ok := table.FieldMap[column]; ok { + ok := false + if table != nil { + _, ok = table.FieldMap[column] + } + + if ok { if q.modelValues == nil { q.modelValues = make(map[string]schema.QueryWithArgs) } |