ref: fb007e9ae56f295abe9835485f98dcf3cc362420
parent: 4c560020bc0c50f8004873be8adf83698b7c095a
author: Anton Harniakou <[email protected]>
date: Thu May 30 08:32:58 EDT 2019
tpl/collections: Convert numeric values to float64 and compare them Fixes #5685
--- a/tpl/collections/where.go
+++ b/tpl/collections/where.go
@@ -114,6 +114,17 @@
slv = v.Interface()
slmv = mv.Interface()
}
+ } else if isNumber(v.Kind()) && isNumber(mv.Kind()) {+ fv, err := toFloat(v)
+ if err != nil {+ return false, err
+ }
+ fvp = &fv
+ fmv, err := toFloat(mv)
+ if err != nil {+ return false, err
+ }
+ fmvp = &fmv
} else { if mv.Kind() != reflect.Array && mv.Kind() != reflect.Slice {return false, nil
@@ -426,6 +437,8 @@
switch v.Kind() {case reflect.Float32, reflect.Float64:
return v.Float(), nil
+ case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+ return v.Convert(reflect.TypeOf(float64(0))).Float(), nil
case reflect.Interface:
return toFloat(v.Elem())
}
--- a/tpl/collections/where_test.go
+++ b/tpl/collections/where_test.go
@@ -88,6 +88,27 @@
seq: []map[string]float64{ {"a": 1, "b": 2}, {"a": 3, "b": 4}, {"a": 5, "x": 4},},
+ key: "b", match: 4, op: "<",
+ expect: []map[string]float64{{"a": 1, "b": 2}},+ },
+ {+ seq: []map[string]int{+ {"a": 1, "b": 2}, {"a": 3, "b": 4}, {"a": 5, "x": 4},+ },
+ key: "b", match: 4.0, op: "<",
+ expect: []map[string]int{{"a": 1, "b": 2}},+ },
+ {+ seq: []map[string]int{+ {"a": 1, "b": 2}, {"a": 3, "b": 4}, {"a": 5, "x": 4},+ },
+ key: "b", match: 4.2, op: "<",
+ expect: []map[string]int{{"a": 1, "b": 2}, {"a": 3, "b": 4}},+ },
+ {+ seq: []map[string]float64{+ {"a": 1, "b": 2}, {"a": 3, "b": 4}, {"a": 5, "x": 4},+ },
key: "b", match: 4.0, op: "<=",
expect: []map[string]float64{{"a": 1, "b": 2}, {"a": 3, "b": 4}},},