Skip to content

Unwrap wrapper values used in JSON aggregation functions, and un-skip accidentally-skipped tests for this behavior. #2981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 15, 2025
Merged

Unwrap wrapper values used in JSON aggregation functions, and un-skip accidentally-skipped tests for this behavior. #2981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions enginetest/enginetests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5155,12 +5155,14 @@ func TestNullRanges(t *testing.T, harness Harness) {

func TestJsonScripts(t *testing.T, harness Harness, skippedTests []string) {
for _, script := range queries.JsonScripts {
for _, skippedTest := range skippedTests {
if strings.Contains(script.Name, skippedTest) {
t.Skip()
t.Run(script.Name, func(t *testing.T) {
for _, skippedTest := range skippedTests {
if strings.Contains(script.Name, skippedTest) {
t.Skip()
}
}
}
TestScript(t, harness, script)
TestScript(t, harness, script)
})
}
}

Expand Down
11 changes: 8 additions & 3 deletions sql/expression/function/aggregation/json_agg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,11 @@ func (j *jsonObjectBuffer) Update(ctx *sql.Context, row sql.Row) error {
return err
}

// unwrap JSON values
// unwrap wrapper values
val, err = sql.UnwrapAny(ctx, val)
if err != nil {
return err
}
if js, ok := val.(sql.JSONWrapper); ok {
val, err = js.ToInterface()
if err != nil {
Expand All @@ -166,11 +170,12 @@ func (j *jsonObjectBuffer) Update(ctx *sql.Context, row sql.Row) error {
}

// Update the map.
keyAsString, _, err := types.LongText.Convert(ctx, key)
convertedKey, _, err := types.LongText.Convert(ctx, key)
if err != nil {
return nil
}
j.vals[keyAsString.(string)] = val
keyAsString, _, err := sql.Unwrap[string](ctx, convertedKey)
j.vals[keyAsString] = val

return nil
}
Expand Down
6 changes: 5 additions & 1 deletion sql/expression/function/aggregation/unary_agg_buffers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,11 @@ func (j *jsonArrayBuffer) Update(ctx *sql.Context, row sql.Row) error {
return err
}

// unwrap JSON values
// unwrap wrapper values
v, err = sql.UnwrapAny(ctx, v)
if err != nil {
return err
}
if js, ok := v.(sql.JSONWrapper); ok {
v, err = js.ToInterface()
if err != nil {
Expand Down
12 changes: 10 additions & 2 deletions sql/expression/function/aggregation/window_functions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1049,7 +1049,11 @@ func (a *WindowedJSONArrayAgg) aggregateVals(ctx *sql.Context, interval sql.Wind
return nil, err
}

// unwrap JSON values
// unwrap wrapper values
v, err = sql.UnwrapAny(ctx, v)
if err != nil {
return nil, err
}
if js, ok := v.(sql.JSONWrapper); ok {
v, err = js.ToInterface()
if err != nil {
Expand Down Expand Up @@ -1136,7 +1140,11 @@ func (a *WindowedJSONObjectAgg) aggregateVals(ctx *sql.Context, interval sql.Win
return nil, err
}

// unwrap JSON values
// unwrap wrapper values
val, err = sql.UnwrapAny(ctx, val)
if err != nil {
return nil, err
}
if js, ok := val.(sql.JSONWrapper); ok {
val, err = js.ToInterface()
if err != nil {
Expand Down