From 67a2b3650c5f586431c8559bc9b609699de8431d Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Mon, 3 Mar 2025 10:42:05 +0000 Subject: bumps our uptrace/bun dependencies to v1.2.10 (#3865) --- vendor/github.com/uptrace/bun/query_merge.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'vendor/github.com/uptrace/bun/query_merge.go') diff --git a/vendor/github.com/uptrace/bun/query_merge.go b/vendor/github.com/uptrace/bun/query_merge.go index 0c172f180..67dc43974 100644 --- a/vendor/github.com/uptrace/bun/query_merge.go +++ b/vendor/github.com/uptrace/bun/query_merge.go @@ -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 { -- cgit v1.2.3