Use COALESCE instead of OR

Co-authored-by: Koen Bollen <[email protected]>

Author: erikdubbelboer

filter/converter.go

@@ -137,7 +137,7 @@ func (c *Converter) convertFilter(filter map[string]any, paramIndex int) (string
 			paramIndex += len(innerValues)
 			// Just putting a NOT around the condition is not enough, a non existing jsonb field will for example
 			// make the whole inner condition NULL. And NOT NULL is still a falsy value, so we need to check for NULL explicitly.
-			conditions = append(conditions, fmt.Sprintf("(NOT %s OR %s IS NULL)", innerConditions, innerConditions))
+			conditions = append(conditions, fmt.Sprintf("(NOT COALESCE(%s, FALSE))", innerConditions))
 			values = append(values, innerValues...)
 		default:
 			if !isValidPostgresIdentifier(key) {

filter/converter_test.go

@@ -228,7 +228,7 @@ func TestConverter_Convert(t *testing.T) {
 			"$not operator",
 			nil,
 			`{"$not": {"name": "John"}}`,
-			`(NOT ("name" = $1) OR ("name" = $1) IS NULL)`,
+			`(NOT COALESCE(("name" = $1), FALSE))`,
 			[]any{"John"},
 			nil,
 		},

integration/postgres_test.go

@@ -310,11 +310,17 @@ func TestIntegration_BasicOperators(t *testing.T) {
 			nil,
 		},
 		{
-			`jsonb equal to null`,
+			`$not on jsonb column`,
 			`{"$not": {"pet": "cat"}}`,
 			[]int{1, 3, 5, 7, 9, 10},
 			nil,
 		},
+		{
+			`$not on normal column`,
+			`{"$not": {"mount": "horse"}}`,
+			[]int{3, 4, 5, 6, 7, 8, 9, 10},
+			nil,
+		},
 	}
 
 	for _, tt := range tests {