mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-12-23 08:56:15 -06:00
[chore]: Bump github.com/uptrace/bun/extra/bunotel from 1.2.9 to 1.2.10
Bumps [github.com/uptrace/bun/extra/bunotel](https://github.com/uptrace/bun) from 1.2.9 to 1.2.10. - [Release notes](https://github.com/uptrace/bun/releases) - [Changelog](https://github.com/uptrace/bun/blob/master/CHANGELOG.md) - [Commits](https://github.com/uptrace/bun/compare/v1.2.9...v1.2.10) --- updated-dependencies: - dependency-name: github.com/uptrace/bun/extra/bunotel dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
parent
8488ac9286
commit
78e03263ea
31 changed files with 417 additions and 204 deletions
5
vendor/github.com/uptrace/bun/query_merge.go
generated
vendored
5
vendor/github.com/uptrace/bun/query_merge.go
generated
vendored
|
|
@ -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 {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue