diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2025-01-27 15:54:51 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2025-01-27 15:54:51 +0000 |
| commit | 3617e27afa181392763258240bc276f3da4b44e2 (patch) | |
| tree | 9a65f9a361fd9ddf53de7d32ca35c81aade6cb84 /vendor/github.com/uptrace/bun/query_merge.go | |
| parent | [feature/frontend] Add login button to index page which reiterates info about... (diff) | |
| download | gotosocial-3617e27afa181392763258240bc276f3da4b44e2.tar.xz | |
bumps uptrace/bun deps to v1.2.8 (#3698)
Diffstat (limited to 'vendor/github.com/uptrace/bun/query_merge.go')
| -rw-r--r-- | vendor/github.com/uptrace/bun/query_merge.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vendor/github.com/uptrace/bun/query_merge.go b/vendor/github.com/uptrace/bun/query_merge.go index 7dee02002..0c172f180 100644 --- a/vendor/github.com/uptrace/bun/query_merge.go +++ b/vendor/github.com/uptrace/bun/query_merge.go @@ -26,8 +26,7 @@ var _ Query = (*MergeQuery)(nil) func NewMergeQuery(db *DB) *MergeQuery { q := &MergeQuery{ baseQuery: baseQuery{ - db: db, - conn: db.DB, + db: db, }, } if q.db.dialect.Name() != dialect.MSSQL && q.db.dialect.Name() != dialect.PG { @@ -61,12 +60,12 @@ func (q *MergeQuery) Apply(fns ...func(*MergeQuery) *MergeQuery) *MergeQuery { return q } -func (q *MergeQuery) With(name string, query schema.QueryAppender) *MergeQuery { +func (q *MergeQuery) With(name string, query Query) *MergeQuery { q.addWith(name, query, false) return q } -func (q *MergeQuery) WithRecursive(name string, query schema.QueryAppender) *MergeQuery { +func (q *MergeQuery) WithRecursive(name string, query Query) *MergeQuery { q.addWith(name, query, true) return q } |