tpl/collections: Convert numeric values to float64 and compare them

Fixes #5685

diff --git a/tpl/collections/where.go b/tpl/collections/where.go
index c96c38910666c85be8d7e83993c2b7e842161fea..17d6552e62914f1cad7267e499fcb9cf55b0b9d6 100644 (file)
--- a/tpl/collections/where.go
+++ b/tpl/collections/where.go
@@ -114,6 +114,17 @@ func (ns *Namespace) checkCondition(v, mv reflect.Value, op string) (bool, error
                        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 @@ func toFloat(v reflect.Value) (float64, error) {
        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())
        }

diff --git a/tpl/collections/where_test.go b/tpl/collections/where_test.go
index fb768cfdeb2e10bea921e64a580343105d51a873..295b89051b7069fa5a5250440c84ca8c753b3b92 100644 (file)
--- a/tpl/collections/where_test.go
+++ b/tpl/collections/where_test.go
@@ -84,6 +84,27 @@ func TestWhere(t *testing.T) {
                        key: "b", match: 4.0, op: "<",
                        expect: []map[string]float64{{"a": 1, "b": 2}},
                },
+               {
+                       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},