github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update netquery query handler to only use strftime when the given value is a number kind

Browse Source
This commit is contained in:
Patrick Pacher
2023-09-07 11:58:07 +02:00
parent d96f841bef
commit 4cd6823066
4 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
netquery/orm/decoder.go
View File

@@ -289,7 +289,7 @@ func decodeBasic() DecodeFunc {
// if we have the column definition available we
// use the target go type from there.
if colDef != nil {
valueKind = normalizeKind(colDef.GoType.Kind())
valueKind = NormalizeKind(colDef.GoType.Kind())
// if we have a column definition we try to convert the value to
// the actual Go-type that was used in the model.
@@ -458,10 +458,10 @@ func runDecodeHooks(colIdx int, colDef *ColumnDef, stmt Stmt, fieldDef reflect.S
// to their base type.
func getKind(val reflect.Value) reflect.Kind {
kind := val.Kind()
return normalizeKind(kind)
return NormalizeKind(kind)
}
func normalizeKind(kind reflect.Kind) reflect.Kind {
func NormalizeKind(kind reflect.Kind) reflect.Kind {
switch {
case kind >= reflect.Int && kind <= reflect.Int64:
return reflect.Int