BlackForestBytes/goext
13
0
Fork 0
Code Pull Requests Actions Activity

updated mongo driver dependencies to v2

Browse Source 
# Conflicts:
#	exerr/constructor.go
#	exerr/dataCategory.go
#	exerr/dataSeverity.go
#	exerr/dataType.go
#	exerr/exerr.go
#	go.mod
#	mongoext/registry.go
#	reflectext/primStrSer.go
#	rfctime/date.go
#	rfctime/rfc3339.go
#	rfctime/rfc3339Nano.go
#	rfctime/seconds.go
#	rfctime/unix.go
#	rfctime/unixMilli.go
#	rfctime/unixNano.go
#	wmo/collection.go
#	wmo/queryInsert.go
This commit is contained in:
Viktor Neubauer
2026-04-21 12:11:38 +02:00
parent f62e7499ec
commit 852468f976
36 changed files with 278 additions and 679 deletions
Download Patch File Download Diff File Expand all files Collapse all files
exerr/constructor.go
+9 -12
View File
@@ -3,13 +3,14 @@ package exerr
import (
"encoding/json"
"fmt"
"go.mongodb.org/mongo-driver/bson/primitive"
"git.blackforestbytes.com/BlackForestBytes/goext/langext"
"go.mongodb.org/mongo-driver/v2/bson"
"maps"
"reflect"
"time"
)
var reflectTypeStr = reflect.TypeOf("")
var reflectTypeStr = reflect.TypeFor[string]()
func FromError(err error) *ExErr {
@@ -152,20 +153,18 @@ func getForeignMeta(err error) (mm MetaMap) {
}()
rval := reflect.ValueOf(err)
if rval.Kind() == reflect.Interface || rval.Kind() == reflect.Ptr {
if rval.Kind() == reflect.Interface || rval.Kind() == reflect.Pointer {
rval = reflect.ValueOf(err).Elem()
}
mm.add("foreign.errortype", MDTString, rval.Type().String())
for k, v := range addMetaPrefix("foreign", getReflectedMetaValues(err, 8)) {
mm[k] = v
}
maps.Copy(mm, addMetaPrefix("foreign", getReflectedMetaValues(err, 8)))
return mm
}
func getReflectedMetaValues(value interface{}, remainingDepth int) map[string]MetaValue {
func getReflectedMetaValues(value any, remainingDepth int) map[string]MetaValue {
if remainingDepth <= 0 {
return map[string]MetaValue{}
@@ -177,7 +176,7 @@ func getReflectedMetaValues(value interface{}, remainingDepth int) map[string]Me
rval := reflect.ValueOf(value)
if rval.Type().Kind() == reflect.Ptr {
if rval.Type().Kind() == reflect.Pointer {
if rval.IsNil() {
return map[string]MetaValue{"*": {DataType: MDTNil, Value: nil}}
@@ -223,7 +222,7 @@ func getReflectedMetaValues(value interface{}, remainingDepth int) map[string]Me
return map[string]MetaValue{"": {DataType: MDTIntArray, Value: ifraw}}
case []int32:
return map[string]MetaValue{"": {DataType: MDTInt32Array, Value: ifraw}}
case primitive.ObjectID:
case bson.ObjectID:
return map[string]MetaValue{"": {DataType: MDTObjectID, Value: ifraw}}
case []string:
return map[string]MetaValue{"": {DataType: MDTStringArray, Value: ifraw}}
@@ -237,9 +236,7 @@ func getReflectedMetaValues(value interface{}, remainingDepth int) map[string]Me
fieldname := fieldtype.Name
if fieldtype.IsExported() {
for k, v := range addMetaPrefix(fieldname, getReflectedMetaValues(rval.Field(i).Interface(), remainingDepth-1)) {
m[k] = v
}
maps.Copy(m, addMetaPrefix(fieldname, getReflectedMetaValues(rval.Field(i).Interface(), remainingDepth-1)))
}
}
return m