From 6433a505820cfeb43990a3453a0ed8b24e432b7d Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Mon, 15 Jan 2024 14:08:07 +0100 Subject: [chore] update bun + extras v1.1.16 -> v1.1.17 (#2534) --- vendor/github.com/uptrace/bun/query_merge.go | 2 +- 1 file changed, 1 insertion(+), 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 706dc20ae..626752b8a 100644 --- a/vendor/github.com/uptrace/bun/query_merge.go +++ b/vendor/github.com/uptrace/bun/query_merge.go @@ -29,7 +29,7 @@ func NewMergeQuery(db *DB) *MergeQuery { conn: db.DB, }, } - if !(q.db.dialect.Name() == dialect.MSSQL || q.db.dialect.Name() == dialect.PG) { + if q.db.dialect.Name() != dialect.MSSQL && q.db.dialect.Name() != dialect.PG { q.err = errors.New("bun: merge not supported for current dialect") } return q -- cgit v1.2.3