return null immediately

James Cor · James Cor · commit 8a506428ddfd · 2025-04-21T17:41:06.000-07:00
diff --git a/enginetest/queries/queries.go b/enginetest/queries/queries.go
@@ -9855,7 +9855,13 @@ from typestable`,
 		},
 	},
 	{
-		Query: `SELECT json_type(json_extract('{"a": null}', null));`,
+		Query: `SELECT json_type(json_extract('{"a": 123}', null));`,
+		Expected: []sql.Row{
+			{"NULL"},
+		},
+	},
+	{
+		Query: `SELECT json_type(json_extract('{"a": 123}', '$.a', null));`,
 		Expected: []sql.Row{
 			{"NULL"},
 		},
diff --git a/sql/expression/function/json/json_extract.go b/sql/expression/function/json/json_extract.go
@@ -101,9 +101,9 @@ func (j *JSONExtract) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		if err != nil {
 			return nil, err
 		}
-		
+
 		if path == nil {
-			continue
+			return nil, nil
 		}
 
 		results[i], err = types.LookupJSONValue(searchable, path.(string))

Original file line number	Diff line number	Diff line change
`@@ -101,9 +101,9 @@ func (j JSONExtract) Eval(ctx sql.Context, row sql.Row) (interface{}, error) {`
`101`	`101`	`if err != nil {`
`102`	`102`	`return nil, err`
`103`	`103`	`}`
`104`		`-`
	`104`	`+`
`105`	`105`	`if path == nil {`
`106`		`- continue`
	`106`	`+ return nil, nil`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`results[i], err = types.LookupJSONValue(searchable, path.(string))`