new impl func interfaces

Author: ungerik

go.work.sum

@@ -1,2 +1,13 @@
+github.com/cention-sany/utf7 v0.0.0-20170124080048-26cad61bd60a h1:MISbI8sU/PSK/ztvmWKFcI7UGb5/HQT7B+i3a2myKgI=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
+github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f h1:3BSP1Tbs2djlpprl7wCLuiqMaUh5SJkkzI2gDs+FgLs=
+github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba h1:QFQpJdgbON7I0jr2hYW7Bs+XV0qjc3d5tZoDnRFnqTg=
+github.com/jhillyerd/enmime v0.10.1 h1:3VP8gFhK7R948YJBrna5bOgnTXEuPAoICo79kKkBKfA=
+github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
+github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
+github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw=
+github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo=
+github.com/teamwork/tnef v0.0.0-20200108124832-7deabccfdb32 h1:j15wq0XPAY/HR/0+dtwUrIrF2ZTKbk7QIES2p4dAG+k=
 github.com/ungerik/go-fs v0.0.0-20230206141012-abb864f815e3 h1:IEm9Je1L3HAIEwiXOuGgJuUPjXXHzf/1e704VyIbcGc=
+golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
+mvdan.cc/xurls/v2 v2.4.0 h1:tzxjVAj+wSBmDcF6zBB7/myTy3gX9xvi8Tyr28AuQgc=

impl/arrays.go

@@ -39,11 +39,30 @@ func ShouldWrapForArrayScanning(v reflect.Value) bool {
 	return false
 }
 
-// IsNonDriverValuerSliceOrArray returns true if passed type
+// IsSliceOrArray returns true if passed value is a slice or array,
+// or a pointer to a slice or array and in case of a slice
+// not of type []byte.
+func IsSliceOrArray(value any) bool {
+	if value == nil {
+		return false
+	}
+	v := reflect.ValueOf(value)
+	if v.Kind() == reflect.Ptr {
+		if v.IsNil() {
+			return false
+		}
+		v = v.Elem()
+	}
+	t := v.Type()
+	k := t.Kind()
+	return k == reflect.Slice && t != typeOfByteSlice || k == reflect.Array
+}
+
+// IsNonDriverValuerSliceOrArrayType returns true if passed type
 // does not implement driver.Valuer and is a slice or array,
 // or a pointer to a slice or array and in case of a slice
 // not of type []byte.
-func IsNonDriverValuerSliceOrArray(t reflect.Type) bool {
+func IsNonDriverValuerSliceOrArrayType(t reflect.Type) bool {
 	if t == nil || t.Implements(typeOfDriverValuer) {
 		return false
 	}

impl/arrays_test.go

@@ -36,7 +36,7 @@ func TestShouldWrapForArrayScanning(t *testing.T) {
 	}
 }
 
-func TestIsNonDriverValuerSliceOrArray(t *testing.T) {
+func TestIsNonDriverValuerSliceOrArrayType(t *testing.T) {
 	tests := []struct {
 		t    reflect.Type
 		want bool
@@ -60,8 +60,8 @@ func TestIsNonDriverValuerSliceOrArray(t *testing.T) {
 		{t: reflect.TypeOf((*[][]byte)(nil)), want: true},
 	}
 	for _, tt := range tests {
-		got := IsNonDriverValuerSliceOrArray(tt.t)
-		assert.Equalf(t, tt.want, got, "IsNonDriverValuerSliceOrArray(%s)", tt.t)
+		got := IsNonDriverValuerSliceOrArrayType(tt.t)
+		assert.Equalf(t, tt.want, got, "IsNonDriverValuerSliceOrArrayType(%s)", tt.t)
 	}
 }
 

impl/errors.go

@@ -26,17 +26,5 @@ type errWithQuery struct {
 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
+	return fmt.Sprintf("%s from query: %s", e.err, FormatQuery(e.query, e.args, e.argFmt))
 }

impl/exec.go

@@ -77,7 +77,7 @@ func FormatValue(val any) (string, error) {
 	return fmt.Sprint(val), nil
 }
 
-func FormatQuery(query, argFmt string, args ...any) string {
+func FormatQuery(query string, args []any, argFmt string) string {
 	for i := len(args) - 1; i >= 0; i-- {
 		placeholder := fmt.Sprintf(argFmt, i+1)
 		value, err := FormatValue(args[i])
@@ -128,8 +128,8 @@ func FormatQuery(query, argFmt string, args ...any) string {
 // to DDL and other statements that do not accept parameters) to be used as part
 // of an SQL statement.  For example:
 //
-//    exp_date := pq.QuoteLiteral("2023-01-05 15:00:00Z")
-//    err := db.Exec(fmt.Sprintf("CREATE ROLE my_user VALID UNTIL %s", exp_date))
+//	exp_date := pq.QuoteLiteral("2023-01-05 15:00:00Z")
+//	err := db.Exec(fmt.Sprintf("CREATE ROLE my_user VALID UNTIL %s", exp_date))
 //
 // Any single quotes in name will be escaped. Any backslashes (i.e. "\") will be
 // replaced by two backslashes (i.e. "\\") and the C-style escape identifier

impl/format.go

@@ -90,7 +90,7 @@ WHERE
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := FormatQuery(tt.query, tt.argFmt, tt.args...); got != tt.want {
+			if got := FormatQuery(tt.query, tt.args, tt.argFmt); got != tt.want {
 				t.Errorf("FormatQuery():\n%q\nWant:\n%q", got, tt.want)
 			}
 		})

impl/format_test.go

@@ -3,6 +3,7 @@ package impl
 import (
 	"context"
 	"database/sql"
+	"database/sql/driver"
 	"errors"
 	"time"
 
@@ -13,7 +14,7 @@ import (
 // for an existing sql.DB connection.
 // argFmt is the format string for argument placeholders like "?" or "$%d"
 // that will be replaced error messages to format a complete query.
-func NewGenericConnection(ctx context.Context, db *sql.DB, config *sqldb.Config, listener sqldb.Listener, structFieldMapper sqldb.StructFieldMapper, validateColumnName func(string) error, argFmt string) sqldb.Connection {
+func NewGenericConnection(ctx context.Context, db *sql.DB, config *sqldb.Config, listener sqldb.Listener, structFieldMapper sqldb.StructFieldMapper, validateColumnName func(string) error, converter driver.ValueConverter, argFmt string) sqldb.Connection {
 	if listener == nil {
 		listener = sqldb.UnsupportedListener()
 	}
@@ -24,6 +25,7 @@ func NewGenericConnection(ctx context.Context, db *sql.DB, config *sqldb.Config,
 		listener:           listener,
 		structFieldMapper:  structFieldMapper,
 		validateColumnName: validateColumnName,
+		converter:          converter,
 		argFmt:             argFmt,
 	}
 }
@@ -35,6 +37,7 @@ type genericConn struct {
 	listener           sqldb.Listener
 	structFieldMapper  sqldb.StructFieldMapper
 	validateColumnName func(string) error
+	converter          driver.ValueConverter
 	argFmt             string
 
 	tx        *sql.Tx
@@ -109,31 +112,31 @@ func (conn *genericConn) queryer() Queryer {
 }
 
 func (conn *genericConn) Exec(query string, args ...any) error {
-	return Exec(conn.ctx, conn.execer(), conn.argFmt, query, args)
+	return Exec(conn.ctx, conn.execer(), query, args, conn.converter, conn.argFmt)
 }
 
 func (conn *genericConn) QueryRow(query string, args ...any) sqldb.RowScanner {
-	return QueryRow(conn.ctx, conn.queryer(), conn.structFieldMapper, conn.argFmt, query, args)
+	return QueryRow(conn.ctx, conn.queryer(), query, args, conn.converter, conn.argFmt, conn.structFieldMapper)
 }
 
 func (conn *genericConn) QueryRows(query string, args ...any) sqldb.RowsScanner {
-	return QueryRows(conn.ctx, conn.queryer(), conn.structFieldMapper, conn.argFmt, query, args)
+	return QueryRows(conn.ctx, conn.queryer(), query, args, conn.converter, conn.argFmt, conn.structFieldMapper)
 }
 
 func (conn *genericConn) Insert(table string, columValues sqldb.Values) error {
-	return Insert(conn.ctx, conn.execer(), table, conn.argFmt, columValues)
+	return Insert(conn.ctx, conn.execer(), table, columValues, conn.converter, conn.argFmt)
 }
 
 func (conn *genericConn) InsertUnique(table string, values sqldb.Values, onConflict string) (inserted bool, err error) {
-	return InsertUnique(conn.ctx, conn.queryer(), conn.structFieldMapper, conn.argFmt, table, values, onConflict)
+	return InsertUnique(conn.ctx, conn.queryer(), table, values, onConflict, conn.converter, conn.argFmt, conn.structFieldMapper)
 }
 
 func (conn *genericConn) InsertReturning(table string, values sqldb.Values, returning string) sqldb.RowScanner {
-	return InsertReturning(conn.ctx, conn.queryer(), conn.structFieldMapper, conn.argFmt, table, values, returning)
+	return InsertReturning(conn.ctx, conn.queryer(), table, values, returning, conn.converter, conn.argFmt, conn.structFieldMapper)
 }
 
 func (conn *genericConn) InsertStruct(table string, rowStruct any, ignoreColumns ...sqldb.ColumnFilter) error {
-	return InsertStruct(conn.ctx, conn.execer(), table, rowStruct, conn.structFieldMapper, conn.argFmt, ignoreColumns)
+	return InsertStruct(conn.ctx, conn.execer(), table, rowStruct, conn.structFieldMapper, ignoreColumns, conn.converter, conn.argFmt)
 }
 
 func (conn *genericConn) InsertStructs(table string, rowStructs any, ignoreColumns ...sqldb.ColumnFilter) error {
@@ -142,23 +145,23 @@ func (conn *genericConn) InsertStructs(table string, rowStructs any, ignoreColum
 }
 
 func (conn *genericConn) InsertUniqueStruct(table string, rowStruct any, onConflict string, ignoreColumns ...sqldb.ColumnFilter) (inserted bool, err error) {
-	return InsertUniqueStruct(conn.ctx, conn.queryer(), conn.structFieldMapper, conn.argFmt, table, rowStruct, onConflict, ignoreColumns)
+	return InsertUniqueStruct(conn.ctx, conn.queryer(), conn.structFieldMapper, table, rowStruct, onConflict, ignoreColumns, conn.converter, conn.argFmt)
 }
 
 func (conn *genericConn) Update(table string, values sqldb.Values, where string, args ...any) error {
-	return Update(conn.ctx, conn.execer(), table, values, where, conn.argFmt, args)
+	return Update(conn.ctx, conn.execer(), table, values, where, args, conn.converter, conn.argFmt)
 }
 
 func (conn *genericConn) UpdateReturningRow(table string, values sqldb.Values, returning, where string, args ...any) sqldb.RowScanner {
-	return UpdateReturningRow(conn.ctx, conn.queryer(), conn.structFieldMapper, conn.argFmt, table, values, returning, where, args)
+	return UpdateReturningRow(conn.ctx, conn.queryer(), table, values, returning, where, args, conn.converter, conn.argFmt, conn.structFieldMapper)
 }
 
 func (conn *genericConn) UpdateReturningRows(table string, values sqldb.Values, returning, where string, args ...any) sqldb.RowsScanner {
-	return UpdateReturningRows(conn.ctx, conn.queryer(), conn.structFieldMapper, conn.argFmt, table, values, returning, where, args)
+	return UpdateReturningRows(conn.ctx, conn.queryer(), table, values, returning, where, args, conn.converter, conn.argFmt, conn.structFieldMapper)
 }
 
 func (conn *genericConn) UpdateStruct(table string, rowStruct any, ignoreColumns ...sqldb.ColumnFilter) error {
-	return UpdateStruct(conn.ctx, conn.execer(), table, rowStruct, conn.structFieldMapper, conn.argFmt, ignoreColumns)
+	return UpdateStruct(conn.ctx, conn.execer(), table, rowStruct, conn.structFieldMapper, ignoreColumns, conn.converter, conn.argFmt)
 }
 
 func (conn *genericConn) UpsertStruct(table string, rowStruct any, ignoreColumns ...sqldb.ColumnFilter) error {
@@ -182,18 +185,11 @@ func (conn *genericConn) Begin(opts *sql.TxOptions, no uint64) (sqldb.Connection
 	if err != nil {
 		return nil, err
 	}
-	return &genericConn{
-		ctx:                conn.ctx,
-		db:                 conn.db, // needed for PingContext, Stats
-		config:             conn.config,
-		listener:           conn.listener,
-		structFieldMapper:  conn.structFieldMapper,
-		argFmt:             conn.argFmt,
-		validateColumnName: conn.validateColumnName,
-		tx:                 tx,
-		txOptions:          opts,
-		txNo:               no,
-	}, nil
+	txConn := conn.clone()
+	txConn.tx = tx
+	txConn.txOptions = opts
+	txConn.txNo = no
+	return txConn, nil
 }
 
 func (conn *genericConn) Commit() error {

impl/genericconnection.go

@@ -2,6 +2,7 @@ package impl
 
 import (
 	"context"
+	"database/sql/driver"
 	"fmt"
 	"reflect"
 	"strings"
@@ -10,25 +11,22 @@ import (
 )
 
 // Insert a new row into table using the values.
-func Insert(ctx context.Context, conn Execer, table, argFmt string, values sqldb.Values) error {
+func Insert(ctx context.Context, conn Execer, table string, values sqldb.Values, converter driver.ValueConverter, argFmt string) error {
 	if len(values) == 0 {
 		return fmt.Errorf("Insert into table %s: no values", table)
 	}
 
-	names, vals := values.Sorted()
-	b := strings.Builder{}
-	writeInsertQuery(&b, table, argFmt, names)
-	query := b.String()
-
-	_, err := conn.ExecContext(ctx, query, vals...)
+	names, args := values.Sorted()
+	query := strings.Builder{}
+	writeInsertQuery(&query, table, argFmt, names)
 
-	return WrapNonNilErrorWithQuery(err, query, argFmt, vals)
+	return Exec(ctx, conn, query.String(), args, converter, argFmt)
 }
 
 // InsertUnique inserts a new row into table using the passed values
 // or does nothing if the onConflict statement applies.
 // Returns if a row was inserted.
-func InsertUnique(ctx context.Context, conn Queryer, mapper sqldb.StructFieldMapper, argFmt, table string, values sqldb.Values, onConflict string) (inserted bool, err error) {
+func InsertUnique(ctx context.Context, conn Queryer, table string, values sqldb.Values, onConflict string, converter driver.ValueConverter, argFmt string, mapper sqldb.StructFieldMapper) (inserted bool, err error) {
 	if len(values) == 0 {
 		return false, fmt.Errorf("InsertUnique into table %s: no values", table)
 	}
@@ -42,13 +40,13 @@ func InsertUnique(ctx context.Context, conn Queryer, mapper sqldb.StructFieldMap
 	writeInsertQuery(&query, table, argFmt, names)
 	fmt.Fprintf(&query, " ON CONFLICT (%s) DO NOTHING RETURNING TRUE", onConflict)
 
-	err = QueryRow(ctx, conn, mapper, argFmt, query.String(), vals).Scan(&inserted)
+	err = QueryRow(ctx, conn, query.String(), vals, converter, argFmt, mapper).Scan(&inserted)
 	return inserted, sqldb.ReplaceErrNoRows(err, nil)
 }
 
 // InsertReturning inserts a new row into table using values
 // and returns values from the inserted row listed in returning.
-func InsertReturning(ctx context.Context, conn Queryer, mapper sqldb.StructFieldMapper, argFmt, table string, values sqldb.Values, returning string) sqldb.RowScanner {
+func InsertReturning(ctx context.Context, conn Queryer, table string, values sqldb.Values, returning string, converter driver.ValueConverter, argFmt string, mapper sqldb.StructFieldMapper) sqldb.RowScanner {
 	if len(values) == 0 {
 		return sqldb.RowScannerWithError(fmt.Errorf("InsertReturning into table %s: no values", table))
 	}
@@ -59,7 +57,7 @@ func InsertReturning(ctx context.Context, conn Queryer, mapper sqldb.StructField
 	query.WriteString(" RETURNING ")
 	query.WriteString(returning)
 
-	return QueryRow(ctx, conn, mapper, argFmt, query.String(), vals)
+	return QueryRow(ctx, conn, query.String(), vals, converter, argFmt, mapper)
 }
 
 func writeInsertQuery(w *strings.Builder, table, argFmt string, names []string) {
@@ -85,27 +83,24 @@ func writeInsertQuery(w *strings.Builder, table, argFmt string, names []string)
 // InsertStruct inserts a new row into table using the connection's
 // StructFieldMapper to map struct fields to column names.
 // Optional ColumnFilter can be passed to ignore mapped columns.
-func InsertStruct(ctx context.Context, conn Execer, table string, rowStruct any, mapper sqldb.StructFieldMapper, argFmt string, ignoreColumns []sqldb.ColumnFilter) error {
+func InsertStruct(ctx context.Context, conn Execer, table string, rowStruct any, mapper sqldb.StructFieldMapper, ignoreColumns []sqldb.ColumnFilter, converter driver.ValueConverter, argFmt string) error {
 	columns, vals, err := insertStructValues(table, rowStruct, mapper, ignoreColumns)
 	if err != nil {
 		return err
 	}
 
-	var b strings.Builder
-	writeInsertQuery(&b, table, argFmt, columns)
-	query := b.String()
-
-	_, err = conn.ExecContext(ctx, query, vals...)
+	var query strings.Builder
+	writeInsertQuery(&query, table, argFmt, columns)
 
-	return WrapNonNilErrorWithQuery(err, query, argFmt, vals)
+	return Exec(ctx, conn, query.String(), vals, converter, argFmt)
 }
 
 // InsertUniqueStruct inserts a new row into table using the connection's
 // StructFieldMapper to map struct fields to column names.
 // Optional ColumnFilter can be passed to ignore mapped columns.
 // Does nothing if the onConflict statement applies
 // and returns if a row was inserted.
-func InsertUniqueStruct(ctx context.Context, conn Queryer, mapper sqldb.StructFieldMapper, argFmt string, table string, rowStruct any, onConflict string, ignoreColumns []sqldb.ColumnFilter) (inserted bool, err error) {
+func InsertUniqueStruct(ctx context.Context, conn Queryer, mapper sqldb.StructFieldMapper, table string, rowStruct any, onConflict string, ignoreColumns []sqldb.ColumnFilter, converter driver.ValueConverter, argFmt string) (inserted bool, err error) {
 	columns, vals, err := insertStructValues(table, rowStruct, mapper, ignoreColumns)
 	if err != nil {
 		return false, err
@@ -115,12 +110,11 @@ func InsertUniqueStruct(ctx context.Context, conn Queryer, mapper sqldb.StructFi
 		onConflict = onConflict[1 : len(onConflict)-1]
 	}
 
-	var b strings.Builder
-	writeInsertQuery(&b, table, argFmt, columns)
-	fmt.Fprintf(&b, " ON CONFLICT (%s) DO NOTHING RETURNING TRUE", onConflict)
-	query := b.String()
+	var query strings.Builder
+	writeInsertQuery(&query, table, argFmt, columns)
+	fmt.Fprintf(&query, " ON CONFLICT (%s) DO NOTHING RETURNING TRUE", onConflict)
 
-	err = QueryRow(ctx, conn, mapper, argFmt, query, vals).Scan(&inserted)
+	err = QueryRow(ctx, conn, query.String(), vals, converter, argFmt, mapper).Scan(&inserted)
 	return inserted, sqldb.ReplaceErrNoRows(err, nil)
 }