updated dependencies and go

This commit is contained in:
2026-04-21 11:06:01 +02:00
parent f62e7499ec
commit 84b87d61f2
91 changed files with 551 additions and 637 deletions
+9 -9
View File
@@ -3,9 +3,9 @@ package sq
import (
"errors"
"fmt"
"git.blackforestbytes.com/BlackForestBytes/goext/langext"
"github.com/jmoiron/sqlx"
"github.com/jmoiron/sqlx/reflectx"
"git.blackforestbytes.com/BlackForestBytes/goext/langext"
"reflect"
"strings"
)
@@ -39,7 +39,7 @@ type ssConverter struct {
func (r *StructScanner) Start(dest any) error {
v := reflect.ValueOf(dest)
if v.Kind() != reflect.Ptr {
if v.Kind() != reflect.Pointer {
return errors.New("must pass a pointer, not a value, to StructScan destination")
}
@@ -54,7 +54,7 @@ func (r *StructScanner) Start(dest any) error {
if f, err := missingFields(r.fields); err != nil && !r.unsafe {
return fmt.Errorf("missing destination name %s in %T", columns[f], dest)
}
r.values = make([]interface{}, len(columns))
r.values = make([]any, len(columns))
r.converter = make([]ssConverter, len(columns))
return nil
@@ -66,7 +66,7 @@ func (r *StructScanner) Start(dest any) error {
func (r *StructScanner) StructScanExt(q Queryable, dest any) error {
v := reflect.ValueOf(dest)
if v.Kind() != reflect.Ptr {
if v.Kind() != reflect.Pointer {
return errors.New("must pass a pointer, not a value, to StructScan destination")
}
@@ -177,7 +177,7 @@ func (r *StructScanner) StructScanExt(q Queryable, dest any) error {
func (r *StructScanner) StructScanBase(dest any) error {
v := reflect.ValueOf(dest)
if v.Kind() != reflect.Ptr {
if v.Kind() != reflect.Pointer {
return errors.New("must pass a pointer, not a value, to StructScan destination")
}
@@ -196,7 +196,7 @@ func (r *StructScanner) StructScanBase(dest any) error {
}
// fieldsByTraversal forked from github.com/jmoiron/sqlx@v1.3.5/sqlx.go
func fieldsByTraversalExtended(q Queryable, v reflect.Value, traversals [][]int, values []interface{}, converter []ssConverter) error {
func fieldsByTraversalExtended(q Queryable, v reflect.Value, traversals [][]int, values []any, converter []ssConverter) error {
v = reflect.Indirect(v)
if v.Kind() != reflect.Struct {
return errors.New("argument not a struct")
@@ -204,7 +204,7 @@ func fieldsByTraversalExtended(q Queryable, v reflect.Value, traversals [][]int,
for i, traversal := range traversals {
if len(traversal) == 0 {
values[i] = new(interface{})
values[i] = new(any)
continue
}
f := reflectx.FieldByIndexes(v, traversal)
@@ -243,7 +243,7 @@ func fieldsByTraversalExtended(q Queryable, v reflect.Value, traversals [][]int,
}
// fieldsByTraversal forked from github.com/jmoiron/sqlx@v1.3.5/sqlx.go
func fieldsByTraversalBase(v reflect.Value, traversals [][]int, values []interface{}, ptrs bool) error {
func fieldsByTraversalBase(v reflect.Value, traversals [][]int, values []any, ptrs bool) error {
v = reflect.Indirect(v)
if v.Kind() != reflect.Struct {
return errors.New("argument not a struct")
@@ -251,7 +251,7 @@ func fieldsByTraversalBase(v reflect.Value, traversals [][]int, values []interfa
for i, traversal := range traversals {
if len(traversal) == 0 {
values[i] = new(interface{})
values[i] = new(any)
continue
}
f := reflectx.FieldByIndexes(v, traversal)