Dont crash on nil in LOGICAL_OR and LOGICAL_AND

goccy · Mar 2, 2024 · b9ff4b4 · b9ff4b4
1 parent 961ce06
commit b9ff4b4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/internal/function_aggregate.go b/internal/function_aggregate.go
@@ -350,6 +350,9 @@ type LOGICAL_AND struct {
 }
 
 func (f *LOGICAL_AND) Step(cond Value, opt *AggregatorOption) error {
+	if cond == nil {
+		return nil
+	}
 	b, err := cond.ToBool()
 	if err != nil {
 		return err
@@ -369,6 +372,9 @@ type LOGICAL_OR struct {
 }
 
 func (f *LOGICAL_OR) Step(cond Value, opt *AggregatorOption) error {
+	if cond == nil {
+		return nil
+	}
 	b, err := cond.ToBool()
 	if err != nil {
 		return err

diff --git a/query_test.go b/query_test.go
@@ -783,11 +783,23 @@ SELECT ARRAY_CONCAT_AGG(x) AS array_concat_agg FROM (
 			query:        `SELECT LOGICAL_AND(x) AS logical_and FROM UNNEST([true, false, true]) AS x`,
 			expectedRows: [][]interface{}{{false}},
 		},
+		{
+			name: "logical_and null",
+			query: ` WITH toks AS (SELECT FALSE AS x UNION ALL SELECT FALSE UNION ALL SELECT NULL)
+SELECT LOGICAL_AND(x) AS logical_or FROM toks`,
+			expectedRows: [][]interface{}{{false}},
+		},
 		{
 			name:         "logical_or",
 			query:        `SELECT LOGICAL_OR(x) AS logical_or FROM UNNEST([true, false, true]) AS x`,
 			expectedRows: [][]interface{}{{true}},
 		},
+		{
+			name: "logical_or null",
+			query: ` WITH toks AS (SELECT FALSE AS x UNION ALL SELECT FALSE UNION ALL SELECT NULL)
+SELECT LOGICAL_OR(x) AS logical_or FROM toks`,
+			expectedRows: [][]interface{}{{false}},
+		},
 		{
 			name:         "max from int group",
 			query:        `SELECT MAX(x) AS max FROM UNNEST([8, 37, 4, 55]) AS x`,