Merge pull request #3091 from dolthub/aaron/json-wrapper-thread-context

reltuk · web-flow · commit 186222f1c013 · 2025-07-14T16:43:45.000-04:00
sql/types: JSONWrapper: Thread Context on some methods on JSON-related types, such as ToInterface and Compare.
diff --git a/enginetest/evaluation.go b/enginetest/evaluation.go
@@ -852,7 +852,7 @@ func WidenRow(t *testing.T, sch sql.Schema, row sql.Row) sql.Row {
 	widened := make(sql.Row, len(row))
 	for i, v := range row {
 		if i < len(sch) && types.IsJSON(sch[i].Type) {
-			widened[i] = widenJSONValues(v)
+			widened[i] = widenJSONValues(t.Context(), v)
 			continue
 		}
 
@@ -893,7 +893,7 @@ func widenValue(t *testing.T, v interface{}) (vw interface{}) {
 	return vw
 }
 
-func widenJSONValues(val interface{}) sql.JSONWrapper {
+func widenJSONValues(ctx context.Context, val interface{}) sql.JSONWrapper {
 	if val == nil {
 		return nil
 	}
@@ -907,7 +907,7 @@ func widenJSONValues(val interface{}) sql.JSONWrapper {
 		js = types.MustJSON(str)
 	}
 
-	doc, err := js.ToInterface()
+	doc, err := js.ToInterface(ctx)
 	if err != nil {
 		panic(err)
 	}
diff --git a/sql/core.go b/sql/core.go
@@ -15,6 +15,7 @@
 package sql
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	trace2 "runtime/trace"
@@ -324,7 +325,7 @@ func ConvertToBool(ctx *Context, v interface{}) (bool, error) {
 	}
 }
 
-func ConvertToVector(v interface{}) ([]float64, error) {
+func ConvertToVector(ctx context.Context, v interface{}) ([]float64, error) {
 	switch b := v.(type) {
 	case []float64:
 		return b, nil
@@ -336,7 +337,7 @@ func ConvertToVector(v interface{}) ([]float64, error) {
 		}
 		return convertJsonInterfaceToVector(val)
 	case JSONWrapper:
-		val, err := b.ToInterface()
+		val, err := b.ToInterface(ctx)
 		if err != nil {
 			return nil, err
 		}
diff --git a/sql/expression/function/aggregation/json_agg.go b/sql/expression/function/aggregation/json_agg.go
@@ -163,7 +163,7 @@ func (j *jsonObjectBuffer) Update(ctx *sql.Context, row sql.Row) error {
 		return err
 	}
 	if js, ok := val.(sql.JSONWrapper); ok {
-		val, err = js.ToInterface()
+		val, err = js.ToInterface(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/sql/expression/function/aggregation/unary_agg_buffers.go b/sql/expression/function/aggregation/unary_agg_buffers.go
@@ -655,7 +655,7 @@ func (j *jsonArrayBuffer) Update(ctx *sql.Context, row sql.Row) error {
 		return err
 	}
 	if js, ok := v.(sql.JSONWrapper); ok {
-		v, err = js.ToInterface()
+		v, err = js.ToInterface(ctx)
 		if err != nil {
 			return err
 		}
diff --git a/sql/expression/function/aggregation/window_functions.go b/sql/expression/function/aggregation/window_functions.go
@@ -1055,7 +1055,7 @@ func (a *WindowedJSONArrayAgg) aggregateVals(ctx *sql.Context, interval sql.Wind
 			return nil, err
 		}
 		if js, ok := v.(sql.JSONWrapper); ok {
-			v, err = js.ToInterface()
+			v, err = js.ToInterface(ctx)
 			if err != nil {
 				return nil, err
 			}
@@ -1146,7 +1146,7 @@ func (a *WindowedJSONObjectAgg) aggregateVals(ctx *sql.Context, interval sql.Win
 			return nil, err
 		}
 		if js, ok := val.(sql.JSONWrapper); ok {
-			val, err = js.ToInterface()
+			val, err = js.ToInterface(ctx)
 			if err != nil {
 				return nil, err
 			}
diff --git a/sql/expression/function/json/json_array.go b/sql/expression/function/json/json_array.go
@@ -113,7 +113,7 @@ func (j *JSONArray) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 
 		switch v := val.(type) {
 		case sql.JSONWrapper:
-			val, err = v.ToInterface()
+			val, err = v.ToInterface(ctx)
 			if err != nil {
 				return nil, err
 			}
diff --git a/sql/expression/function/json/json_array_append.go b/sql/expression/function/json/json_array_append.go
@@ -88,7 +88,7 @@ func (j JSONArrayAppend) Eval(ctx *sql.Context, row sql.Row) (interface{}, error
 
 	// Apply the path-value pairs to the document.
 	for _, pair := range pairs {
-		doc, _, err = doc.ArrayAppend(pair.path, pair.val)
+		doc, _, err = doc.ArrayAppend(ctx, pair.path, pair.val)
 		if err != nil {
 			return nil, err
 		}
diff --git a/sql/expression/function/json/json_array_insert.go b/sql/expression/function/json/json_array_insert.go
@@ -89,7 +89,7 @@ func (j JSONArrayInsert) Eval(ctx *sql.Context, row sql.Row) (interface{}, error
 
 	// Apply the path-value pairs to the document.
 	for _, pair := range pairs {
-		doc, _, err = doc.ArrayInsert(pair.path, pair.val)
+		doc, _, err = doc.ArrayInsert(ctx, pair.path, pair.val)
 		if err != nil {
 			return nil, err
 		}
diff --git a/sql/expression/function/json/json_common.go b/sql/expression/function/json/json_common.go
@@ -102,7 +102,7 @@ func MutableJsonDoc(ctx context.Context, wrapper sql.JSONWrapper) (types.Mutable
 		return mutable, nil
 	}
 
-	val, err := clonedJsonWrapper.ToInterface()
+	val, err := clonedJsonWrapper.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}
diff --git a/sql/expression/function/json/json_contains.go b/sql/expression/function/json/json_contains.go
@@ -147,7 +147,7 @@ func (j *JSONContains) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
 			return nil, err
 		}
 
-		extracted, err := types.LookupJSONValue(target, path.(string))
+		extracted, err := types.LookupJSONValue(ctx, target, path.(string))
 		if err != nil {
 			return nil, err
 		}
@@ -162,11 +162,11 @@ func (j *JSONContains) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
 	}
 
 	// Now determine whether the candidate value exists in the target
-	targetVal, err := target.ToInterface()
+	targetVal, err := target.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}
-	candidateVal, err := candidate.ToInterface()
+	candidateVal, err := candidate.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}
diff --git a/sql/expression/function/json/json_contains_path.go b/sql/expression/function/json/json_contains_path.go
@@ -76,7 +76,7 @@ func (j JSONContainsPath) Eval(ctx *sql.Context, row sql.Row) (interface{}, erro
 			return nil, err
 		}
 
-		result, err := types.LookupJSONValue(target, path.(string))
+		result, err := types.LookupJSONValue(ctx, target, path.(string))
 		if err != nil {
 			return nil, err
 		}
diff --git a/sql/expression/function/json/json_depth.go b/sql/expression/function/json/json_depth.go
@@ -114,7 +114,7 @@ func (j *JSONDepth) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		return nil, nil
 	}
 
-	val, err := doc.ToInterface()
+	val, err := doc.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}
diff --git a/sql/expression/function/json/json_extract.go b/sql/expression/function/json/json_extract.go
@@ -106,7 +106,7 @@ func (j *JSONExtract) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 			return nil, nil
 		}
 
-		results[i], err = types.LookupJSONValue(searchable, path.(string))
+		results[i], err = types.LookupJSONValue(ctx, searchable, path.(string))
 		if err != nil {
 			return nil, fmt.Errorf("failed to extract from expression '%s'; %s", j.JSON.String(), err.Error())
 		}
diff --git a/sql/expression/function/json/json_keys.go b/sql/expression/function/json/json_keys.go
@@ -105,7 +105,7 @@ func (j *JSONKeys) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		return nil, nil
 	}
 
-	js, err := types.LookupJSONValue(doc, *path)
+	js, err := types.LookupJSONValue(ctx, doc, *path)
 	if err != nil {
 		if errors.Is(err, jsonpath.ErrKeyError) {
 			return nil, nil
@@ -117,7 +117,7 @@ func (j *JSONKeys) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		return nil, nil
 	}
 
-	val, err := js.ToInterface()
+	val, err := js.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}
diff --git a/sql/expression/function/json/json_length.go b/sql/expression/function/json/json_length.go
@@ -95,7 +95,7 @@ func (j *JsonLength) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		return nil, strErr
 	}
 
-	res, err := types.LookupJSONValue(doc, path)
+	res, err := types.LookupJSONValue(ctx, doc, path)
 	if err != nil {
 		return nil, err
 	}
@@ -104,7 +104,7 @@ func (j *JsonLength) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		return nil, nil
 	}
 
-	val, err := res.ToInterface()
+	val, err := res.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}
diff --git a/sql/expression/function/json/json_merge_patch.go b/sql/expression/function/json/json_merge_patch.go
@@ -116,7 +116,7 @@ func (j *JSONMergePatch) Eval(ctx *sql.Context, row sql.Row) (interface{}, error
 		return nil, nil
 	}
 
-	val, err := initDoc.ToInterface()
+	val, err := initDoc.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -131,7 +131,7 @@ func (j *JSONMergePatch) Eval(ctx *sql.Context, row sql.Row) (interface{}, error
 		if doc == nil {
 			return nil, nil
 		}
-		val, err = doc.ToInterface()
+		val, err = doc.ToInterface(ctx)
 		if err != nil {
 			return nil, err
 		}
diff --git a/sql/expression/function/json/json_merge_preserve.go b/sql/expression/function/json/json_merge_preserve.go
@@ -124,7 +124,7 @@ func (j *JSONMergePreserve) Eval(ctx *sql.Context, row sql.Row) (interface{}, er
 		return nil, nil
 	}
 
-	val, err := initDoc.ToInterface()
+	val, err := initDoc.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -138,7 +138,7 @@ func (j *JSONMergePreserve) Eval(ctx *sql.Context, row sql.Row) (interface{}, er
 		if doc == nil {
 			return nil, nil
 		}
-		val, err = doc.ToInterface()
+		val, err = doc.ToInterface(ctx)
 		if err != nil {
 			return nil, err
 		}
diff --git a/sql/expression/function/json/json_object.go b/sql/expression/function/json/json_object.go
@@ -116,7 +116,7 @@ func (j JSONObject) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 				return nil, err
 			}
 			if json, ok := val.(sql.JSONWrapper); ok {
-				val, err = json.ToInterface()
+				val, err = json.ToInterface(ctx)
 				if err != nil {
 					return nil, err
 				}
diff --git a/sql/expression/function/json/json_overlaps.go b/sql/expression/function/json/json_overlaps.go
@@ -190,7 +190,7 @@ func (j *JSONOverlaps) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
 	if left == nil {
 		return nil, nil
 	}
-	leftVal, err := left.ToInterface()
+	leftVal, err := left.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -202,7 +202,7 @@ func (j *JSONOverlaps) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
 	if right == nil {
 		return nil, nil
 	}
-	rightVal, err := right.ToInterface()
+	rightVal, err := right.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}
diff --git a/sql/expression/function/json/json_pretty.go b/sql/expression/function/json/json_pretty.go
@@ -83,7 +83,7 @@ func (j *JSONPretty) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 	if doc == nil {
 		return nil, nil
 	}
-	val, err := doc.ToInterface()
+	val, err := doc.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}
diff --git a/sql/expression/function/json/json_search.go b/sql/expression/function/json/json_search.go
@@ -295,7 +295,7 @@ func (j *JSONSearch) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		}
 	}
 
-	val, err := doc.ToInterface()
+	val, err := doc.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}
diff --git a/sql/expression/function/json/json_type.go b/sql/expression/function/json/json_type.go
@@ -109,7 +109,7 @@ func (j JSONType) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		return comparableDoc.Type(ctx)
 	}
 
-	val, err := doc.ToInterface()
+	val, err := doc.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}
diff --git a/sql/expression/function/json/json_value.go b/sql/expression/function/json/json_value.go
@@ -95,7 +95,7 @@ func (j *JsonValue) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 	}
 
 	// json NULLs also result in sql NULLs.
-	cmp, err := types.CompareJSON(js, types.JSONDocument{Val: nil})
+	cmp, err := types.CompareJSON(ctx, js, types.JSONDocument{Val: nil})
 	if cmp == 0 {
 		return nil, nil
 	}
@@ -111,7 +111,7 @@ func (j *JsonValue) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 	}
 
 	var res interface{}
-	res, err = types.LookupJSONValue(searchable, path.(string))
+	res, err = types.LookupJSONValue(ctx, searchable, path.(string))
 	if err != nil || res == nil {
 		return nil, err
 	}
@@ -120,7 +120,7 @@ func (j *JsonValue) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 	// bad lookups on arrays, instead of an error. Note that this will cause lookups that expect [] to return incorrect
 	// results.
 	// See https://github.com/dolthub/dolt/issues/7905 for more information.
-	cmp, err = types.CompareJSON(res, types.JSONDocument{Val: []interface{}{}})
+	cmp, err = types.CompareJSON(ctx, res, types.JSONDocument{Val: []interface{}{}})
 	if err != nil {
 		return nil, err
 	}
@@ -185,7 +185,7 @@ func GetJSONFromWrapperOrCoercibleString(ctx *sql.Context, js interface{}, funct
 		}
 		return jsonData, nil
 	case sql.JSONWrapper:
-		return jsType.ToInterface()
+		return jsType.ToInterface(ctx)
 	default:
 		return nil, sql.ErrInvalidJSONArgument.New(argumentPosition, functionName)
 	}
diff --git a/sql/expression/function/json/jsontests/json_extract_tests.go b/sql/expression/function/json/jsontests/json_extract_tests.go
@@ -15,6 +15,7 @@
 package jsontests
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -67,7 +68,7 @@ func JsonExtractTestCases(t *testing.T, prepare prepareJsonValue) []testCase {
 	}}
 	// Workaround for https://github.com/dolthub/dolt/issues/7998
 	// Otherwise, converting this to a string will create invalid JSON
-	jsonBytes, err := types.MarshallJson(jsonDocument)
+	jsonBytes, err := types.MarshallJson(context.Background(), jsonDocument)
 	require.NoError(t, err)
 	jsonInput := prepare(t, jsonBytes)
 
diff --git a/sql/expression/function/json/jsontests/json_function_tests.go b/sql/expression/function/json/jsontests/json_function_tests.go
@@ -49,7 +49,7 @@ var jsonFormatTests = []jsonFormatTest{
 		prepareFunc: func(t *testing.T, js interface{}) interface{} {
 			doc, _, err := types.JSON.Convert(sqlCtx, js)
 			require.NoError(t, err)
-			val, err := doc.(sql.JSONWrapper).ToInterface()
+			val, err := doc.(sql.JSONWrapper).ToInterface(t.Context())
 			require.NoError(t, err)
 			return types.JSONDocument{Val: val}
 		},
@@ -59,7 +59,7 @@ var jsonFormatTests = []jsonFormatTest{
 		prepareFunc: func(t *testing.T, js interface{}) interface{} {
 			doc, _, err := types.JSON.Convert(sqlCtx, js)
 			require.NoError(t, err)
-			bytes, err := types.MarshallJson(doc.(sql.JSONWrapper))
+			bytes, err := types.MarshallJson(sqlCtx, doc.(sql.JSONWrapper))
 			require.NoError(t, err)
 			return types.NewLazyJSONDocument(bytes)
 		},
diff --git a/sql/expression/function/vector/distance.go b/sql/expression/function/vector/distance.go
diff --git a/sql/fulltext/fulltext.go b/sql/fulltext/fulltext.go
diff --git a/sql/plan/histogram.go b/sql/plan/histogram.go
diff --git a/sql/statistics.go b/sql/statistics.go
diff --git a/sql/stats/statistic.go b/sql/stats/statistic.go
diff --git a/sql/types/json.go b/sql/types/json.go
diff --git a/sql/types/json_value.go b/sql/types/json_value.go
diff --git a/sql/types/jsontests/json_test.go b/sql/types/jsontests/json_test.go
diff --git a/sql/types/jsontests/json_tests.go b/sql/types/jsontests/json_tests.go
diff --git a/sql/types/number.go b/sql/types/number.go
diff --git a/sql/types/strings.go b/sql/types/strings.go
diff --git a/sql/wrapper.go b/sql/wrapper.go

Original file line number	Diff line number	Diff line change
`@@ -852,7 +852,7 @@ func WidenRow(t *testing.T, sch sql.Schema, row sql.Row) sql.Row {`
`852`	`852`	`widened := make(sql.Row, len(row))`
`853`	`853`	`for i, v := range row {`
`854`	`854`	`if i < len(sch) && types.IsJSON(sch[i].Type) {`
`855`		`- widened[i] = widenJSONValues(v)`
	`855`	`+ widened[i] = widenJSONValues(t.Context(), v)`
`856`	`856`	`continue`
`857`	`857`	`}`
`858`	`858`
`@@ -893,7 +893,7 @@ func widenValue(t *testing.T, v interface{}) (vw interface{}) {`
`893`	`893`	`return vw`
`894`	`894`	`}`
`895`	`895`
`896`		`-func widenJSONValues(val interface{}) sql.JSONWrapper {`
	`896`	`+func widenJSONValues(ctx context.Context, val interface{}) sql.JSONWrapper {`
`897`	`897`	`if val == nil {`
`898`	`898`	`return nil`
`899`	`899`	`}`
`@@ -907,7 +907,7 @@ func widenJSONValues(val interface{}) sql.JSONWrapper {`
`907`	`907`	`js = types.MustJSON(str)`
`908`	`908`	`}`
`909`	`909`
`910`		`- doc, err := js.ToInterface()`
	`910`	`+ doc, err := js.ToInterface(ctx)`
`911`	`911`	`if err != nil {`
`912`	`912`	`panic(err)`
`913`	`913`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`package sql`
`16`	`16`
`17`	`17`	`import (`
	`18`	`+ "context"`
`18`	`19`	`"encoding/json"`
`19`	`20`	`"fmt"`
`20`	`21`	`trace2 "runtime/trace"`
`@@ -324,7 +325,7 @@ func ConvertToBool(ctx *Context, v interface{}) (bool, error) {`
`324`	`325`	`}`
`325`	`326`	`}`
`326`	`327`
`327`		`-func ConvertToVector(v interface{}) ([]float64, error) {`
	`328`	`+func ConvertToVector(ctx context.Context, v interface{}) ([]float64, error) {`
`328`	`329`	`switch b := v.(type) {`
`329`	`330`	`case []float64:`
`330`	`331`	`return b, nil`
`@@ -336,7 +337,7 @@ func ConvertToVector(v interface{}) ([]float64, error) {`
`336`	`337`	`}`
`337`	`338`	`return convertJsonInterfaceToVector(val)`
`338`	`339`	`case JSONWrapper:`
`339`		`- val, err := b.ToInterface()`
	`340`	`+ val, err := b.ToInterface(ctx)`
`340`	`341`	`if err != nil {`
`341`	`342`	`return nil, err`
`342`	`343`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ func (j jsonObjectBuffer) Update(ctx sql.Context, row sql.Row) error {`
`163`	`163`	`return err`
`164`	`164`	`}`
`165`	`165`	`if js, ok := val.(sql.JSONWrapper); ok {`
`166`		`- val, err = js.ToInterface()`
	`166`	`+ val, err = js.ToInterface(ctx)`
`167`	`167`	`if err != nil {`
`168`	`168`	`return err`
`169`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -655,7 +655,7 @@ func (j jsonArrayBuffer) Update(ctx sql.Context, row sql.Row) error {`
`655`	`655`	`return err`
`656`	`656`	`}`
`657`	`657`	`if js, ok := v.(sql.JSONWrapper); ok {`
`658`		`- v, err = js.ToInterface()`
	`658`	`+ v, err = js.ToInterface(ctx)`
`659`	`659`	`if err != nil {`
`660`	`660`	`return err`
`661`	`661`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1055,7 +1055,7 @@ func (a WindowedJSONArrayAgg) aggregateVals(ctx sql.Context, interval sql.Wind`
`1055`	`1055`	`return nil, err`
`1056`	`1056`	`}`
`1057`	`1057`	`if js, ok := v.(sql.JSONWrapper); ok {`
`1058`		`- v, err = js.ToInterface()`
	`1058`	`+ v, err = js.ToInterface(ctx)`
`1059`	`1059`	`if err != nil {`
`1060`	`1060`	`return nil, err`
`1061`	`1061`	`}`
`@@ -1146,7 +1146,7 @@ func (a WindowedJSONObjectAgg) aggregateVals(ctx sql.Context, interval sql.Win`
`1146`	`1146`	`return nil, err`
`1147`	`1147`	`}`
`1148`	`1148`	`if js, ok := val.(sql.JSONWrapper); ok {`
`1149`		`- val, err = js.ToInterface()`
	`1149`	`+ val, err = js.ToInterface(ctx)`
`1150`	`1150`	`if err != nil {`
`1151`	`1151`	`return nil, err`
`1152`	`1152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ func (j JSONArray) Eval(ctx sql.Context, row sql.Row) (interface{}, error) {`
`113`	`113`
`114`	`114`	`switch v := val.(type) {`
`115`	`115`	`case sql.JSONWrapper:`
`116`		`- val, err = v.ToInterface()`
	`116`	`+ val, err = v.ToInterface(ctx)`
`117`	`117`	`if err != nil {`
`118`	`118`	`return nil, err`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func (j JSONArrayAppend) Eval(ctx *sql.Context, row sql.Row) (interface{}, error`
`88`	`88`
`89`	`89`	`// Apply the path-value pairs to the document.`
`90`	`90`	`for _, pair := range pairs {`
`91`		`- doc, _, err = doc.ArrayAppend(pair.path, pair.val)`
	`91`	`+ doc, _, err = doc.ArrayAppend(ctx, pair.path, pair.val)`
`92`	`92`	`if err != nil {`
`93`	`93`	`return nil, err`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ func (j JSONArrayInsert) Eval(ctx *sql.Context, row sql.Row) (interface{}, error`
`89`	`89`
`90`	`90`	`// Apply the path-value pairs to the document.`
`91`	`91`	`for _, pair := range pairs {`
`92`		`- doc, _, err = doc.ArrayInsert(pair.path, pair.val)`
	`92`	`+ doc, _, err = doc.ArrayInsert(ctx, pair.path, pair.val)`
`93`	`93`	`if err != nil {`
`94`	`94`	`return nil, err`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ func MutableJsonDoc(ctx context.Context, wrapper sql.JSONWrapper) (types.Mutable`
`102`	`102`	`return mutable, nil`
`103`	`103`	`}`
`104`	`104`
`105`		`- val, err := clonedJsonWrapper.ToInterface()`
	`105`	`+ val, err := clonedJsonWrapper.ToInterface(ctx)`
`106`	`106`	`if err != nil {`
`107`	`107`	`return nil, err`
`108`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ func (j JSONContains) Eval(ctx sql.Context, row sql.Row) (interface{}, error)`
`147`	`147`	`return nil, err`
`148`	`148`	`}`
`149`	`149`
`150`		`- extracted, err := types.LookupJSONValue(target, path.(string))`
	`150`	`+ extracted, err := types.LookupJSONValue(ctx, target, path.(string))`
`151`	`151`	`if err != nil {`
`152`	`152`	`return nil, err`
`153`	`153`	`}`
`@@ -162,11 +162,11 @@ func (j JSONContains) Eval(ctx sql.Context, row sql.Row) (interface{}, error)`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`// Now determine whether the candidate value exists in the target`
`165`		`- targetVal, err := target.ToInterface()`
	`165`	`+ targetVal, err := target.ToInterface(ctx)`
`166`	`166`	`if err != nil {`
`167`	`167`	`return nil, err`
`168`	`168`	`}`
`169`		`- candidateVal, err := candidate.ToInterface()`
	`169`	`+ candidateVal, err := candidate.ToInterface(ctx)`
`170`	`170`	`if err != nil {`
`171`	`171`	`return nil, err`
`172`	`172`	`}`