mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-30 14:02:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bumps our uptrace/bun dependencies to v1.2.10 (#3865)

Browse source
This commit is contained in:
kim 2025-03-03 10:42:05 +00:00 • committed by GitHub
commit 67a2b3650c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
37 changed files with 518 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

5
vendor/github.com/uptrace/bun/query_merge.go generated vendored
View file

@ -30,7 +30,7 @@ func NewMergeQuery(db *DB) *MergeQuery {
},
}
if q.db.dialect.Name() != dialect.MSSQL && q.db.dialect.Name() != dialect.PG {
q.err = errors.New("bun: merge not supported for current dialect")
q.setErr(errors.New("bun: merge not supported for current dialect"))
}
return q
}
@ -243,6 +243,9 @@ func (q *MergeQuery) scanOrExec(
return nil, err
}
// if a comment is propagated via the context, use it
setCommentFromContext(ctx, q)
// Generate the query before checking hasReturning.
queryBytes, err := q.AppendQuery(q.db.fmter, q.db.makeQueryBytes())
if err != nil {