mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-12-16 09:53:03 -06:00
bumps uptrace/bun deps to v1.2.8 (#3698)
This commit is contained in:
parent
7b7fc528f1
commit
3617e27afa
35 changed files with 760 additions and 220 deletions
7
vendor/github.com/uptrace/bun/query_merge.go
generated
vendored
7
vendor/github.com/uptrace/bun/query_merge.go
generated
vendored
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue