From 3fceb5fc1a83a6ba3ca3c314eef50f0b45cd6009 Mon Sep 17 00:00:00 2001
From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>
Date: Mon, 25 Nov 2024 15:42:37 +0000
Subject: bumps uptrace/bun dependencies to v1.2.6 (#3569)

---
 vendor/github.com/uptrace/bun/query_merge.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(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 626752b8a..3c3f4f7f8 100644
--- a/vendor/github.com/uptrace/bun/query_merge.go
+++ b/vendor/github.com/uptrace/bun/query_merge.go
@@ -50,10 +50,12 @@ func (q *MergeQuery) Err(err error) *MergeQuery {
 	return q
 }
 
-// Apply calls the fn passing the MergeQuery as an argument.
-func (q *MergeQuery) Apply(fn func(*MergeQuery) *MergeQuery) *MergeQuery {
-	if fn != nil {
-		return fn(q)
+// Apply calls each function in fns, passing the MergeQuery as an argument.
+func (q *MergeQuery) Apply(fns ...func(*MergeQuery) *MergeQuery) *MergeQuery {
+	for _, fn := range fns {
+		if fn != nil {
+			q = fn(q)
+		}
 	}
 	return q
 }
-- 
cgit v1.2.3