mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-11-03 14:32:25 -06:00
bumps our uptrace/bun dependencies to v1.2.10 (#3865)
This commit is contained in:
parent
97adf00cd4
commit
12d4d36bc8
37 changed files with 518 additions and 225 deletions
13
vendor/github.com/uptrace/bun/query_update.go
generated
vendored
13
vendor/github.com/uptrace/bun/query_update.go
generated
vendored
|
|
@ -123,7 +123,7 @@ func (q *UpdateQuery) SetColumn(column string, query string, args ...interface{}
|
|||
// Value overwrites model value for the column.
|
||||
func (q *UpdateQuery) Value(column string, query string, args ...interface{}) *UpdateQuery {
|
||||
if q.table == nil {
|
||||
q.err = errNilModel
|
||||
q.setErr(errNilModel)
|
||||
return q
|
||||
}
|
||||
q.addValue(q.table, column, query, args)
|
||||
|
|
@ -154,7 +154,7 @@ func (q *UpdateQuery) JoinOnOr(cond string, args ...interface{}) *UpdateQuery {
|
|||
|
||||
func (q *UpdateQuery) joinOn(cond string, args []interface{}, sep string) *UpdateQuery {
|
||||
if len(q.joins) == 0 {
|
||||
q.err = errors.New("bun: query has no joins")
|
||||
q.setErr(errors.New("bun: query has no joins"))
|
||||
return q
|
||||
}
|
||||
j := &q.joins[len(q.joins)-1]
|
||||
|
|
@ -206,7 +206,7 @@ func (q *UpdateQuery) WhereAllWithDeleted() *UpdateQuery {
|
|||
// ------------------------------------------------------------------------------
|
||||
func (q *UpdateQuery) Order(orders ...string) *UpdateQuery {
|
||||
if !q.hasFeature(feature.UpdateOrderLimit) {
|
||||
q.err = feature.NewNotSupportError(feature.UpdateOrderLimit)
|
||||
q.setErr(feature.NewNotSupportError(feature.UpdateOrderLimit))
|
||||
return q
|
||||
}
|
||||
q.addOrder(orders...)
|
||||
|
|
@ -215,7 +215,7 @@ func (q *UpdateQuery) Order(orders ...string) *UpdateQuery {
|
|||
|
||||
func (q *UpdateQuery) OrderExpr(query string, args ...interface{}) *UpdateQuery {
|
||||
if !q.hasFeature(feature.UpdateOrderLimit) {
|
||||
q.err = feature.NewNotSupportError(feature.UpdateOrderLimit)
|
||||
q.setErr(feature.NewNotSupportError(feature.UpdateOrderLimit))
|
||||
return q
|
||||
}
|
||||
q.addOrderExpr(query, args...)
|
||||
|
|
@ -224,7 +224,7 @@ func (q *UpdateQuery) OrderExpr(query string, args ...interface{}) *UpdateQuery
|
|||
|
||||
func (q *UpdateQuery) Limit(n int) *UpdateQuery {
|
||||
if !q.hasFeature(feature.UpdateOrderLimit) {
|
||||
q.err = feature.NewNotSupportError(feature.UpdateOrderLimit)
|
||||
q.setErr(feature.NewNotSupportError(feature.UpdateOrderLimit))
|
||||
return q
|
||||
}
|
||||
q.setLimit(n)
|
||||
|
|
@ -556,6 +556,9 @@ func (q *UpdateQuery) 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 {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue