diff --git a/goextVersion.go b/goextVersion.go index 62cd23c..5b277d8 100644 --- a/goextVersion.go +++ b/goextVersion.go @@ -1,5 +1,5 @@ package goext -const GoextVersion = "0.0.407" +const GoextVersion = "0.0.408" -const GoextVersionTimestamp = "2024-03-11T16:40:41+0100" +const GoextVersionTimestamp = "2024-03-11T16:41:47+0100" diff --git a/sq/list.go b/sq/list.go index affee37..e5db344 100644 --- a/sq/list.go +++ b/sq/list.go @@ -6,7 +6,7 @@ import ( "gogs.mikescher.com/BlackForestBytes/goext/exerr" ) -func Iterate[TData any](ctx context.Context, q Queryable, table string, filter PaginateFilter, scanMode StructScanMode, scanSec StructScanSafety, page int, limit *int, consumer func(v TData) error) (int, error) { +func Iterate[TData any](ctx context.Context, q Queryable, table string, filter PaginateFilter, scanMode StructScanMode, scanSec StructScanSafety, page int, limit *int, consumer func(ctx context.Context, v TData) error) (int, error) { if filter == nil { filter = NewEmptyPaginateFilter() } diff --git a/sq/scanner.go b/sq/scanner.go index 7a422ab..3eb3cc7 100644 --- a/sq/scanner.go +++ b/sq/scanner.go @@ -334,7 +334,7 @@ func ScanAll[TData any](ctx context.Context, q Queryable, rows *sqlx.Rows, mode return res, nil } -func IterateAll[TData any](ctx context.Context, q Queryable, rows *sqlx.Rows, mode StructScanMode, sec StructScanSafety, close bool, consumer func(v TData) error) (int, error) { +func IterateAll[TData any](ctx context.Context, q Queryable, rows *sqlx.Rows, mode StructScanMode, sec StructScanSafety, close bool, consumer func(ctx context.Context, v TData) error) (int, error) { var strscan *StructScanner if sec == Safe { @@ -370,7 +370,7 @@ func IterateAll[TData any](ctx context.Context, q Queryable, rows *sqlx.Rows, mo return rcount, err } - err = consumer(data) + err = consumer(ctx, data) if err != nil { return rcount, exerr.Wrap(err, "").Build() } @@ -384,7 +384,7 @@ func IterateAll[TData any](ctx context.Context, q Queryable, rows *sqlx.Rows, mo return rcount, err } - err = consumer(data) + err = consumer(ctx, data) if err != nil { return rcount, exerr.Wrap(err, "").Build() }