[chore] Update a bunch of database dependencies (#1772)

* [chore] Update a bunch of database dependencies

* fix lil thing
This commit is contained in:
tobi
2023-05-12 14:33:40 +02:00
committed by GitHub
parent 66df974143
commit ec325fee14
402 changed files with 35068 additions and 35401 deletions

View File

@ -2,6 +2,7 @@ package bun
import (
"context"
"database/sql"
"github.com/uptrace/bun/schema"
)
@ -46,19 +47,46 @@ func (q *RawQuery) Err(err error) *RawQuery {
return q
}
func (q *RawQuery) Exec(ctx context.Context, dest ...interface{}) (sql.Result, error) {
return q.scanOrExec(ctx, dest, len(dest) > 0)
}
func (q *RawQuery) Scan(ctx context.Context, dest ...interface{}) error {
_, err := q.scanOrExec(ctx, dest, true)
return err
}
func (q *RawQuery) scanOrExec(
ctx context.Context, dest []interface{}, hasDest bool,
) (sql.Result, error) {
if q.err != nil {
return q.err
return nil, q.err
}
model, err := q.getModel(dest)
if err != nil {
return err
var model Model
var err error
if hasDest {
model, err = q.getModel(dest)
if err != nil {
return nil, err
}
}
query := q.db.format(q.query, q.args)
_, err = q.scan(ctx, q, query, model, true)
return err
var res sql.Result
if hasDest {
res, err = q.scan(ctx, q, query, model, hasDest)
} else {
res, err = q.exec(ctx, q, query)
}
if err != nil {
return nil, err
}
return res, nil
}
func (q *RawQuery) AppendQuery(fmter schema.Formatter, b []byte) ([]byte, error) {