Skip to content

[no-release-notes] Tweak ComparableJSON interface to take context parameter and have mor… #3254

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
Oct 7, 2025
Merged

[no-release-notes] Tweak ComparableJSON interface to take context parameter and have mor… #3254

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
2 changes: 1 addition & 1 deletion sql/expression/function/json/json_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func (j JSONType) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
}

if comparableDoc, ok := doc.(types.ComparableJSON); ok {
return comparableDoc.Type(ctx)
return comparableDoc.JsonType(ctx)
}

val, err := doc.ToInterface(ctx)
Expand Down
8 changes: 4 additions & 4 deletions sql/types/json_value.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ type SearchableJSON interface {

type ComparableJSON interface {
sql.JSONWrapper
Compare(other interface{}) (int, error)
Type(ctx context.Context) (string, error)
Compare(ctx context.Context, other interface{}) (int, error)
JsonType(ctx context.Context) (string, error)
}

// MutableJSON is a JSON value that can be efficiently modified. These modifications return the new value, but they
Expand Down Expand Up @@ -510,11 +510,11 @@ func CompareJSON(ctx context.Context, a, b interface{}) (int, error) {
}

if comparableA, ok := a.(ComparableJSON); ok {
return comparableA.Compare(b)
return comparableA.Compare(ctx, b)
}

if comparableB, ok := b.(ComparableJSON); ok {
result, err := comparableB.Compare(a)
result, err := comparableB.Compare(ctx, a)
return -result, err
}

Expand Down