Return nil for null values in IN(), BETWEEN(), AND LIKE() (#31)

Recidiviz · Jun 29, 2024 · a65bec1 · a65bec1
1 parent c9bf947
commit a65bec1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/internal/function.go b/internal/function.go
@@ -237,9 +237,6 @@ func BETWEEN(target, start, end Value) (Value, error) {
 }
 
 func IN(a Value, values ...Value) (Value, error) {
-	if a == nil {
-		return nil, nil
-	}
 	for _, v := range values {
 		if v == nil {
 			continue

diff --git a/internal/function_bind.go b/internal/function_bind.go
@@ -378,7 +378,7 @@ func bindBitXor(args ...Value) (Value, error) {
 
 func bindInArray(args ...Value) (Value, error) {
 	if existsNull(args) {
-		return BoolValue(false), nil
+		return nil, nil
 	}
 	return ARRAY_IN(args[0], args[1])
 }
@@ -534,19 +534,22 @@ func bindBitCount(args ...Value) (Value, error) {
 
 func bindLike(args ...Value) (Value, error) {
 	if existsNull(args) {
-		return BoolValue(false), nil
+		return nil, nil
 	}
 	return LIKE(args[0], args[1])
 }
 
 func bindBetween(args ...Value) (Value, error) {
 	if existsNull(args) {
-		return BoolValue(false), nil
+		return nil, nil
 	}
 	return BETWEEN(args[0], args[1], args[2])
 }
 
 func bindIn(args ...Value) (Value, error) {
+	if existsNull(args) {
+		return nil, nil
+	}
 	return IN(args[0], args[1:]...)
 }
 

diff --git a/query_test.go b/query_test.go
@@ -207,13 +207,13 @@ UNION ALL
 		},
 		{
 			name:         "between operator",
-			query:        `SELECT DATE "2022-09-10" BETWEEN "2022-09-01" and "2022-10-01"`,
-			expectedRows: [][]interface{}{{true}},
+			query:        `SELECT DATE "2022-09-10" BETWEEN "2022-09-01" and "2022-10-01", (SELECT NULL) BETWEEN 0 AND 2`,
+			expectedRows: [][]interface{}{{true, nil}},
 		},
 		{
 			name:         "not between operator",
-			query:        `SELECT DATE "2020-09-10" NOT BETWEEN "2022-09-01" and "2022-10-01"`,
-			expectedRows: [][]interface{}{{true}},
+			query:        `SELECT DATE "2020-09-10" NOT BETWEEN "2022-09-01" and "2022-10-01", (SELECT NULL) BETWEEN 0 AND 2`,
+			expectedRows: [][]interface{}{{true, nil}},
 		},
 		{
 			name:  "in operator",