BlackForestBytes/goext
19
0
Fork 0
Code Actions Activity

v0.0.351 sq value converter
All checks were successful
Build Docker and Deploy / Run goext test-suite (push) Successful in 2m30s
Details

Browse Source
This commit is contained in:
Mike Schwörer
2023-12-29 19:25:36 +01:00
parent 6e90239fef
commit f9ccafb976
12 changed files with 280 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sq/scanner.go
View File

@@ -13,8 +13,8 @@ import (
type StructScanMode string
const (
SModeFast StructScanMode = "FAST"
SModeExtended StructScanMode = "EXTENDED"
SModeFast StructScanMode = "FAST" // Use default sq.Scan, does not work with joined/resolved types and/or custom value converter
SModeExtended StructScanMode = "EXTENDED" // Fully featured perhaps (?) a tiny bit slower - default
)
type StructScanSafety string
@@ -51,7 +51,13 @@ func InsertSingle[TData any](ctx context.Context, q Queryable, tableName string,
columns = append(columns, "\""+columnName+"\"")
params = append(params, ":"+paramkey)
pp[paramkey] = rvfield.Interface()
val, err := convertValueToDB(q, rvfield.Interface())
if err != nil {
return nil, err
}
pp[paramkey] = val
}
@@ -71,7 +77,7 @@ func QuerySingle[TData any](ctx context.Context, q Queryable, sql string, pp PP,
return *new(TData), err
}
data, err := ScanSingle[TData](rows, mode, sec, true)
data, err := ScanSingle[TData](ctx, q, rows, mode, sec, true)
if err != nil {
return *new(TData), err
}
@@ -85,7 +91,7 @@ func QueryAll[TData any](ctx context.Context, q Queryable, sql string, pp PP, mo
return nil, err
}
data, err := ScanAll[TData](rows, mode, sec, true)
data, err := ScanAll[TData](ctx, q, rows, mode, sec, true)
if err != nil {
return nil, err
}
@@ -93,7 +99,7 @@ func QueryAll[TData any](ctx context.Context, q Queryable, sql string, pp PP, mo
return data, nil
}
func ScanSingle[TData any](rows *sqlx.Rows, mode StructScanMode, sec StructScanSafety, close bool) (TData, error) {
func ScanSingle[TData any](ctx context.Context, q Queryable, rows *sqlx.Rows, mode StructScanMode, sec StructScanSafety, close bool) (TData, error) {
if rows.Next() {
var strscan *StructScanner
@@ -123,7 +129,7 @@ func ScanSingle[TData any](rows *sqlx.Rows, mode StructScanMode, sec StructScanS
return *new(TData), err
}
} else if mode == SModeExtended {
err := strscan.StructScanExt(&data)
err := strscan.StructScanExt(q, &data)
if err != nil {
return *new(TData), err
}
@@ -149,6 +155,10 @@ func ScanSingle[TData any](rows *sqlx.Rows, mode StructScanMode, sec StructScanS
return *new(TData), err
}
if err := ctx.Err(); err != nil {
return *new(TData), err
}
return data, nil
} else {
@@ -159,7 +169,7 @@ func ScanSingle[TData any](rows *sqlx.Rows, mode StructScanMode, sec StructScanS
}
}
func ScanAll[TData any](rows *sqlx.Rows, mode StructScanMode, sec StructScanSafety, close bool) ([]TData, error) {
func ScanAll[TData any](ctx context.Context, q Queryable, rows *sqlx.Rows, mode StructScanMode, sec StructScanSafety, close bool) ([]TData, error) {
var strscan *StructScanner
if sec == Safe {
@@ -182,6 +192,11 @@ func ScanAll[TData any](rows *sqlx.Rows, mode StructScanMode, sec StructScanSafe
res := make([]TData, 0)
for rows.Next() {
if err := ctx.Err(); err != nil {
return nil, err
}
if mode == SModeFast {
var data TData
err := strscan.StructScanBase(&data)
@@ -191,7 +206,7 @@ func ScanAll[TData any](rows *sqlx.Rows, mode StructScanMode, sec StructScanSafe
res = append(res, data)
} else if mode == SModeExtended {
var data TData
err := strscan.StructScanExt(&data)
err := strscan.StructScanExt(q, &data)
if err != nil {
return nil, err
}