v0.0.387 bf

go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.17.0 // indirect
+	github.com/go-playground/validator/v10 v10.18.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/uuid v1.5.0 // indirect

go.sum

@@ -33,6 +33,8 @@ github.com/go-playground/validator/v10 v10.16.0 h1:x+plE831WK4vaKHO/jpgUGsvLKIqR
 github.com/go-playground/validator/v10 v10.16.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-playground/validator/v10 v10.17.0 h1:SmVVlfAOtlZncTxRuinDPomC2DkXJ4E5T9gDA0AIH74=
 github.com/go-playground/validator/v10 v10.17.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
+github.com/go-playground/validator/v10 v10.18.0 h1:BvolUXjp4zuvkZ5YN5t7ebzbhlUtPsPm2S9NAZ5nl9U=
+github.com/go-playground/validator/v10 v10.18.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=

goextVersion.go

@@ -1,5 +1,5 @@
 package goext
 
-const GoextVersion = "0.0.383"
+const GoextVersion = "0.0.387"
 
-const GoextVersionTimestamp = "2024-02-09T15:17:51+0100"
+const GoextVersionTimestamp = "2024-02-12T18:17:49+0100"

sq/scanner.go

@@ -4,9 +4,11 @@ import (
 	"context"
 	"database/sql"
 	"errors"
+	"fmt"
 	"github.com/jmoiron/sqlx"
 	"gogs.mikescher.com/BlackForestBytes/goext/exerr"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"reflect"
 )
 
 type StructScanMode string
@@ -38,6 +40,49 @@ func InsertSingle[TData any](ctx context.Context, q Queryable, tableName string,
 	return sqlr, nil
 }
 
+func InsertAndQuerySingle[TData any](ctx context.Context, q Queryable, tableName string, v TData, idColumn string, mode StructScanMode, sec StructScanSafety) (TData, error) {
+
+	rval := reflect.ValueOf(v)
+
+	idRVal := fieldByTag(rval, "db", idColumn)
+	if !idRVal.IsValid() || idRVal.IsZero() {
+		return *new(TData), fmt.Errorf("failed to find idColumn '%s' in %T", idColumn, v)
+	}
+
+	idValue, err := convertValueToDB(q, idRVal.Interface())
+	if err != nil {
+		return *new(TData), err
+	}
+
+	_, err = InsertSingle[TData](ctx, q, tableName, v)
+	if err != nil {
+		return *new(TData), err
+	}
+
+	pp := PP{}
+
+	//goland:noinspection ALL
+	sqlstr := fmt.Sprintf("SELECT * FROM %s WHERE %s = :%s", tableName, idColumn, pp.Add(idValue))
+
+	return QuerySingle[TData](ctx, q, sqlstr, pp, mode, sec)
+}
+
+func fieldByTag(rval reflect.Value, tagkey string, tagval string) reflect.Value {
+	rtyp := rval.Type()
+	for i := 0; i < rtyp.NumField(); i++ {
+		rsfield := rtyp.Field(i)
+
+		if !rsfield.IsExported() {
+			continue
+		}
+
+		if rsfield.Tag.Get(tagkey) == tagval {
+			return rval.Field(i)
+		}
+	}
+	panic(fmt.Sprintf("tag %s = '%s' not found in %s", tagkey, tagval, rtyp.Name()))
+}
+
 func InsertMultiple[TData any](ctx context.Context, q Queryable, tableName string, vArr []TData, maxBatch int) ([]sql.Result, error) {
 
 	if len(vArr) == 0 {
@@ -89,6 +134,33 @@ func UpdateSingle[TData any](ctx context.Context, q Queryable, tableName string,
 	return sqlr, nil
 }
 
+func UpdateAndQuerySingle[TData any](ctx context.Context, q Queryable, tableName string, v TData, idColumn string, mode StructScanMode, sec StructScanSafety) (TData, error) {
+
+	rval := reflect.ValueOf(v)
+
+	idRVal := fieldByTag(rval, "db", idColumn)
+	if !idRVal.IsValid() || idRVal.IsZero() {
+		return *new(TData), fmt.Errorf("failed to find idColumn '%s' in %T", idColumn, v)
+	}
+
+	idValue, err := convertValueToDB(q, idRVal.Interface())
+	if err != nil {
+		return *new(TData), err
+	}
+
+	_, err = UpdateSingle[TData](ctx, q, tableName, v, idColumn)
+	if err != nil {
+		return *new(TData), err
+	}
+
+	pp := PP{}
+
+	//goland:noinspection ALL
+	sqlstr := fmt.Sprintf("SELECT * FROM %s WHERE %s = :%s", tableName, idColumn, pp.Add(idValue))
+
+	return QuerySingle[TData](ctx, q, sqlstr, pp, mode, sec)
+}
+
 func QuerySingle[TData any](ctx context.Context, q Queryable, sql string, pp PP, mode StructScanMode, sec StructScanSafety) (TData, error) {
 	rows, err := q.Query(ctx, sql, pp)
 	if err != nil {
@@ -103,6 +175,23 @@ func QuerySingle[TData any](ctx context.Context, q Queryable, sql string, pp PP,
 	return data, nil
 }
 
+func QuerySingleOpt[TData any](ctx context.Context, q Queryable, sqlstr string, pp PP, mode StructScanMode, sec StructScanSafety) (*TData, error) {
+	rows, err := q.Query(ctx, sqlstr, pp)
+	if err != nil {
+		return nil, err
+	}
+
+	data, err := ScanSingle[TData](ctx, q, rows, mode, sec, true)
+	if errors.Is(err, sql.ErrNoRows) {
+		return nil, nil
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	return &data, nil
+}
+
 func QueryAll[TData any](ctx context.Context, q Queryable, sql string, pp PP, mode StructScanMode, sec StructScanSafety) ([]TData, error) {
 	rows, err := q.Query(ctx, sql, pp)
 	if err != nil {