Fix suggestions

Author: erikdubbelboer

filter/converter.go

@@ -237,26 +237,22 @@ func (c *Converter) convertFilter(filter map[string]any, paramIndex int) (string
 						values = append(values, innerValues...)
 					default:
 						value := v[operator]
-						isNumericOperatorMap := false
+						isNumericOperator := false
 						op, ok := textOperatorMap[operator]
 						if !ok {
 							op, ok = numericOperatorMap[operator]
 							if !ok {
 								return "", nil, fmt.Errorf("unknown operator: %s", operator)
 							}
-							isNumericOperatorMap = true
+							isNumericOperator = true
 						}
 
 						if !isScalar(value) {
 							return "", nil, fmt.Errorf("invalid comparison value (must be a primitive): %v", value)
 						}
 
-						if isNumericOperatorMap && isNumeric(value) {
-							if c.isNestedColumn(key) {
-								inner = append(inner, fmt.Sprintf("((%s)::numeric %s $%d)", c.columnName(key), op, paramIndex))
-							} else {
-								inner = append(inner, fmt.Sprintf("(%s %s $%d)", c.columnName(key), op, paramIndex))
-							}
+						if isNumericOperator && isNumeric(value) && c.isNestedColumn(key) {
+							inner = append(inner, fmt.Sprintf("((%s)::numeric %s $%d)", c.columnName(key), op, paramIndex))
 						} else {
 							inner = append(inner, fmt.Sprintf("(%s %s $%d)", c.columnName(key), op, paramIndex))
 						}

filter/converter_test.go

@@ -366,6 +366,14 @@ func TestConverter_Convert(t *testing.T) {
 			[]any{float64(0)},
 			nil,
 		},
+		{
+			"numeric comparison against null with jsonb column",
+			filter.WithNestedJSONB("meta"),
+			`{"foo": {"$gt": null}}`,
+			`("meta"->>'foo' > $1)`,
+			[]any{nil},
+			nil,
+		},
 	}
 
 	for _, tt := range tests {

filter/util.go

@@ -1,16 +1,10 @@
 package filter
 
 func isNumeric(v any) bool {
-	if v == nil {
-		return true
-	}
-
-	switch v.(type) {
-	case float64:
-		return true
-	default:
-		return false
-	}
+	// json.Unmarshal returns float64 for all numbers
+	// so we only need to check for float64.
+	_, ok := v.(float64)
+	return ok
 }
 
 func isScalar(v any) bool {

integration/postgres_test.go

@@ -286,13 +286,13 @@ func TestIntegration_BasicOperators(t *testing.T) {
 			nil,
 		},
 		{
-			`invalid value type 1`,
+			`invalid value type int`,
 			`{"level": "town1"}`, // Level is an integer column, but the value is a string.
 			nil,
 			errors.New(`pq: invalid input syntax for type integer: "town1"`),
 		},
 		{
-			`invalid value type 2`,
+			`invalid value type string`,
 			`{"name": 123}`, // Name is a string column, but the value is an integer.
 			[]int{},
 			nil,
@@ -388,9 +388,15 @@ func TestIntegration_BasicOperators(t *testing.T) {
 			nil,
 		},
 		{
-			"numeric comparison bug bug with jsonb column",
+			`$lt bug with jsonb column`,
 			`{"guild_id": {"$lt": 100}}`,
-			[]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, // wrong
+			[]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
+			nil,
+		},
+		{
+			`$lt with null and jsonb column`,
+			`{"guild_id": {"$lt": null}}`,
+			[]int{},
 			nil,
 		},
 	}