mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-10-30 12:12:25 -05:00
upstep bun to v1.0.9 (#252)
This commit is contained in:
parent
08cb8a3385
commit
9a53b1a8d1
53 changed files with 285 additions and 791 deletions
47
vendor/github.com/uptrace/bun/query_base.go
generated
vendored
47
vendor/github.com/uptrace/bun/query_base.go
generated
vendored
|
|
@ -68,10 +68,10 @@ type baseQuery struct {
|
|||
db *DB
|
||||
conn IConn
|
||||
|
||||
model model
|
||||
model Model
|
||||
err error
|
||||
|
||||
tableModel tableModel
|
||||
tableModel TableModel
|
||||
table *schema.Table
|
||||
|
||||
with []withQuery
|
||||
|
|
@ -86,10 +86,39 @@ func (q *baseQuery) DB() *DB {
|
|||
return q.db
|
||||
}
|
||||
|
||||
type query interface {
|
||||
GetModel() Model
|
||||
GetTableName() string
|
||||
}
|
||||
|
||||
var _ query = (*baseQuery)(nil)
|
||||
|
||||
func (q *baseQuery) GetModel() Model {
|
||||
return q.model
|
||||
}
|
||||
|
||||
func (q *baseQuery) GetTableName() string {
|
||||
if q.table != nil {
|
||||
return q.table.Name
|
||||
}
|
||||
|
||||
for _, wq := range q.with {
|
||||
if v, ok := wq.query.(query); ok {
|
||||
if model := v.GetModel(); model != nil {
|
||||
return v.GetTableName()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if q.modelTable.Query != "" {
|
||||
return q.modelTable.Query
|
||||
}
|
||||
if len(q.tables) > 0 {
|
||||
return q.tables[0].Query
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (q *baseQuery) setConn(db IConn) {
|
||||
// Unwrap Bun wrappers to not call query hooks twice.
|
||||
switch db := db.(type) {
|
||||
|
|
@ -113,7 +142,7 @@ func (q *baseQuery) setTableModel(modeli interface{}) {
|
|||
}
|
||||
|
||||
q.model = model
|
||||
if tm, ok := model.(tableModel); ok {
|
||||
if tm, ok := model.(TableModel); ok {
|
||||
q.tableModel = tm
|
||||
q.table = tm.Table()
|
||||
}
|
||||
|
|
@ -125,7 +154,7 @@ func (q *baseQuery) setErr(err error) {
|
|||
}
|
||||
}
|
||||
|
||||
func (q *baseQuery) getModel(dest []interface{}) (model, error) {
|
||||
func (q *baseQuery) getModel(dest []interface{}) (Model, error) {
|
||||
if len(dest) == 0 {
|
||||
if q.model != nil {
|
||||
return q.model, nil
|
||||
|
|
@ -427,12 +456,12 @@ func (q *baseQuery) _getFields(omitPK bool) ([]*schema.Field, error) {
|
|||
|
||||
func (q *baseQuery) scan(
|
||||
ctx context.Context,
|
||||
queryApp schema.Query,
|
||||
iquery IQuery,
|
||||
query string,
|
||||
model model,
|
||||
model Model,
|
||||
hasDest bool,
|
||||
) (sql.Result, error) {
|
||||
ctx, event := q.db.beforeQuery(ctx, queryApp, query, nil)
|
||||
ctx, event := q.db.beforeQuery(ctx, iquery, query, nil, q.model)
|
||||
|
||||
rows, err := q.conn.QueryContext(ctx, query)
|
||||
if err != nil {
|
||||
|
|
@ -459,10 +488,10 @@ func (q *baseQuery) scan(
|
|||
|
||||
func (q *baseQuery) exec(
|
||||
ctx context.Context,
|
||||
queryApp schema.Query,
|
||||
iquery IQuery,
|
||||
query string,
|
||||
) (sql.Result, error) {
|
||||
ctx, event := q.db.beforeQuery(ctx, queryApp, query, nil)
|
||||
ctx, event := q.db.beforeQuery(ctx, iquery, query, nil, q.model)
|
||||
|
||||
res, err := q.conn.ExecContext(ctx, query)
|
||||
if err != nil {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue