diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2023-09-11 15:16:52 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-09-11 15:16:52 +0200 |
| commit | 7011f57b09fc03bde9d48fef191e904110c09c4b (patch) | |
| tree | 1118192d6c8d49715d2293ee19c79e50b89de64e /vendor/github.com/uptrace/bun/query_select.go | |
| parent | [chore]: Bump golang.org/x/net from 0.14.0 to 0.15.0 (#2193) (diff) | |
| download | gotosocial-7011f57b09fc03bde9d48fef191e904110c09c4b.tar.xz | |
[chore] bump bun v1.1.14 -> v1.1.15 (#2195)
Diffstat (limited to 'vendor/github.com/uptrace/bun/query_select.go')
| -rw-r--r-- | vendor/github.com/uptrace/bun/query_select.go | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/vendor/github.com/uptrace/bun/query_select.go b/vendor/github.com/uptrace/bun/query_select.go index a24a9f6f1..c0e145110 100644 --- a/vendor/github.com/uptrace/bun/query_select.go +++ b/vendor/github.com/uptrace/bun/query_select.go @@ -551,6 +551,11 @@ func (q *SelectQuery) appendQuery( } } + b, err = q.appendIndexHints(fmter, b) + if err != nil { + return nil, err + } + if err := q.forEachInlineRelJoin(func(j *relationJoin) error { b = append(b, ' ') b, err = j.appendHasOneJoin(fmter, b, q) @@ -566,11 +571,6 @@ func (q *SelectQuery) appendQuery( } } - b, err = q.appendIndexHints(fmter, b) - if err != nil { - return nil, err - } - b, err = q.appendWhere(fmter, b, true) if err != nil { return nil, err @@ -813,7 +813,11 @@ func (q *SelectQuery) Rows(ctx context.Context) (*sql.Rows, error) { } query := internal.String(queryBytes) - return q.conn.QueryContext(ctx, query) + + ctx, event := q.db.beforeQuery(ctx, q, query, nil, query, q.model) + rows, err := q.conn.QueryContext(ctx, query) + q.db.afterQuery(ctx, event, nil, err) + return rows, err } func (q *SelectQuery) Exec(ctx context.Context, dest ...interface{}) (res sql.Result, err error) { |