Skip to content

Commit

Permalink
add GetRows method
Browse files Browse the repository at this point in the history
  • Loading branch information
egnd committed Apr 6, 2023
1 parent 8a94a16 commit b3d081c
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.idea/*
/.devcontainer
.DS_Store
18 changes: 14 additions & 4 deletions dbr.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ func exec(ctx context.Context, runner runner, log EventReceiver, builder Builder
return result, nil
}

func query(ctx context.Context, runner runner, log EventReceiver, builder Builder, d Dialect, dest interface{}) (int, error) {
func queryRows(ctx context.Context, runner runner, log EventReceiver, builder Builder, d Dialect) (*sql.Rows, *string, error) {
i := interpolator{
Buffer: NewBuffer(),
Dialect: d,
Expand All @@ -172,7 +172,7 @@ func query(ctx context.Context, runner runner, log EventReceiver, builder Builde
err := i.interpolate(placeholder, []interface{}{builder})
query, value := i.String(), i.Value()
if err != nil {
return 0, log.EventErrKv("dbr.select.interpolate", err, kvs{
return nil, nil, log.EventErrKv("dbr.select.interpolate", err, kvs{
"sql": query,
"args": fmt.Sprint(value),
})
Expand All @@ -197,14 +197,24 @@ func query(ctx context.Context, runner runner, log EventReceiver, builder Builde
traceImpl.SpanError(ctx, err)
}

return 0, log.EventErrKv("dbr.select.load.query", err, kvs{
return nil, &query, log.EventErrKv("dbr.select.load.query", err, kvs{
"sql": query,
})
}

return rows, &query, nil
}

func query(ctx context.Context, runner runner, log EventReceiver, builder Builder, d Dialect, dest interface{}) (int, error) {
rows, query, err := queryRows(ctx, runner, log, builder, d)
if err != nil {
return 0, err
}

count, err := Load(rows, dest)
if err != nil {
return 0, log.EventErrKv("dbr.select.load.scan", err, kvs{
"sql": query,
"sql": *query,
})
}
return count, nil
Expand Down
8 changes: 8 additions & 0 deletions select_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package dbr

import (
"context"
"database/sql"
"reflect"
"time"
)
Expand Down Expand Up @@ -170,6 +171,13 @@ func (b *selectBuilder) LoadStructsContext(ctx context.Context, value interface{
return c, err
}

// GetRows returns sql.Rows from query result.
func (b *selectBuilder) GetRows(ctx context.Context) (*sql.Rows, error) {
rows, _, err := queryRows(ctx, b.runner, b.EventReceiver, b, b.Dialect)

return rows, err
}

// LoadValue loads any value from query result with background context, returns ErrNotFound if there is no result
func (b *selectBuilder) LoadValue(value interface{}) error {
return b.LoadValueContext(context.Background(), value)
Expand Down

0 comments on commit b3d081c

Please sign in to comment.