mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-11-01 13:12:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[chore] Bump database dependencies (#1164)

Browse source 
github.com/uptrace/bun v1.1.8 -> v1.1.9
github.com/uptrace/bun/pgdialect v1.1.8 -> v1.1.9
github.com/uptrace/bun/sqlitedialect v1.1.8 -> v1.1.9
modernc.org/sqlite v1.18.2 -> v1.19.5
This commit is contained in:
tobi 2022-11-28 11:19:39 +01:00 • committed by GitHub
commit daf44ac2b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
529 changed files with 971879 additions and 1370194 deletions
Download patch file Download diff file Expand all files Collapse all files

23
vendor/github.com/uptrace/bun/query_base.go generated vendored
View file

@ -20,8 +20,9 @@ const (
)
type withQuery struct {
name string
query schema.QueryAppender
name string
query schema.QueryAppender
recursive bool
}
// IConn is a common interface for *sql.DB, *sql.Conn, and *sql.Tx.
@ -158,8 +159,7 @@ func (q *baseQuery) setConn(db IConn) {
}
}
// TODO: rename to setModel
func (q *baseQuery) setTableModel(modeli interface{}) {
func (q *baseQuery) setModel(modeli interface{}) {
model, err := newSingleModel(q.db, modeli)
if err != nil {
q.setErr(err)
@ -238,17 +238,18 @@ func (q *baseQuery) isSoftDelete() bool {
if q.table != nil {
return q.table.SoftDeleteField != nil &&
!q.flags.Has(allWithDeletedFlag) &&
!q.flags.Has(forceDeleteFlag)
(!q.flags.Has(forceDeleteFlag) || q.flags.Has(deletedFlag))
}
return false
}
//------------------------------------------------------------------------------
func (q *baseQuery) addWith(name string, query schema.QueryAppender) {
func (q *baseQuery) addWith(name string, query schema.QueryAppender, recursive bool) {
q.with = append(q.with, withQuery{
name: name,
query: query,
name: name,
query: query,
recursive: recursive,
})
}
@ -263,6 +264,10 @@ func (q *baseQuery) appendWith(fmter schema.Formatter, b []byte) (_ []byte, err
b = append(b, ", "...)
}
if with.recursive {
b = append(b, "RECURSIVE "...)
}
b, err = q.appendCTE(fmter, b, with)
if err != nil {
return nil, err
@ -768,7 +773,7 @@ func (q *whereBaseQuery) addWhereCols(cols []string) {
func (q *whereBaseQuery) mustAppendWhere(
fmter schema.Formatter, b []byte, withAlias bool,
) ([]byte, error) {
if len(q.where) == 0 && q.whereFields == nil {
if len(q.where) == 0 && q.whereFields == nil && !q.flags.Has(deletedFlag) {
err := errors.New("bun: Update and Delete queries require at least one Where")
return nil, err
}