replace impl.combineErrors with errors.Join

Author: ungerik

impl/errors.go

@@ -28,15 +28,3 @@ func (e errWithQuery) Unwrap() error { return e.err }
 func (e errWithQuery) Error() string {
 	return fmt.Sprintf("%s from query: %s", e.err, FormatQuery(e.query, e.argFmt, e.args...))
 }
-
-func combineErrors(prim, sec error) error {
-	switch {
-	case prim != nil && sec != nil:
-		return fmt.Errorf("%w\n%s", prim, sec)
-	case prim != nil:
-		return prim
-	case sec != nil:
-		return sec
-	}
-	return nil
-}

impl/rowscanner.go

@@ -2,6 +2,7 @@ package impl
 
 import (
 	"database/sql"
+	"errors"
 
 	sqldb "github.com/domonda/go-sqldb"
 )
@@ -27,7 +28,7 @@ func NewRowScanner(rows Rows, structFieldNamer sqldb.StructFieldMapper, query, a
 
 func (s *RowScanner) Scan(dest ...any) (err error) {
 	defer func() {
-		err = combineErrors(err, s.rows.Close())
+		err = errors.Join(err, s.rows.Close())
 		err = WrapNonNilErrorWithQuery(err, s.query, s.argFmt, s.args)
 	}()
 
@@ -46,7 +47,7 @@ func (s *RowScanner) Scan(dest ...any) (err error) {
 
 func (s *RowScanner) ScanStruct(dest any) (err error) {
 	defer func() {
-		err = combineErrors(err, s.rows.Close())
+		err = errors.Join(err, s.rows.Close())
 		err = WrapNonNilErrorWithQuery(err, s.query, s.argFmt, s.args)
 	}()
 

impl/rowsscanner.go

@@ -71,7 +71,7 @@ func (s *RowsScanner) ScanAllRowsAsStrings(headerRow bool) (rows [][]string, err
 
 func (s *RowsScanner) ForEachRow(callback func(sqldb.RowScanner) error) (err error) {
 	defer func() {
-		err = combineErrors(err, s.rows.Close())
+		err = errors.Join(err, s.rows.Close())
 		err = WrapNonNilErrorWithQuery(err, s.query, s.argFmt, s.args)
 	}()