Merge pull request #2980 from dolthub/nicktobey/unwrap3

Unwrap inputs to JSON_OBJECT.

Author: nicktobey

enginetest/enginetests.go

@@ -1907,7 +1907,7 @@ func TestComplexIndexQueriesPrepared(t *testing.T, harness Harness) {
 }
 
 func TestJsonScriptsPrepared(t *testing.T, harness Harness, skippedTests []string) {
-	harness.Setup(setup.MydbData)
+	harness.Setup(setup.MydbData, setup.BlobData)
 	for _, script := range queries.JsonScripts {
 		for _, skippedTest := range skippedTests {
 			if strings.Contains(script.Name, skippedTest) {
@@ -5154,6 +5154,7 @@ func TestNullRanges(t *testing.T, harness Harness) {
 }
 
 func TestJsonScripts(t *testing.T, harness Harness, skippedTests []string) {
+	harness.Setup(setup.MydbData, setup.BlobData)
 	for _, script := range queries.JsonScripts {
 		for _, skippedTest := range skippedTests {
 			if strings.Contains(script.Name, skippedTest) {

enginetest/queries/json_scripts.go

@@ -126,6 +126,17 @@ var JsonScripts = []ScriptTest{
 			},
 		},
 	},
+	{
+		Name: "json_object works on text values from tables",
+		Assertions: []ScriptTestAssertion{
+			{
+				Query: `select JSON_OBJECT(t, t) FROM textt where i = 1;`,
+				Expected: []sql.Row{
+					{types.MustJSON("{\"first row\": \"first row\"}")},
+				},
+			},
+		},
+	},
 	{
 		Name: "types survive round-trip into tables",
 		SetUpScript: []string{

sql/expression/function/json/json_object.go

@@ -102,12 +102,19 @@ func (j JSONObject) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 			return nil, err
 		}
 		if i%2 == 0 {
-			val, _, err := types.LongText.Convert(ctx, val)
+			val, _, err = types.LongText.Convert(ctx, val)
+			if err != nil {
+				return nil, err
+			}
+			key, _, err = sql.Unwrap[string](ctx, val)
 			if err != nil {
 				return nil, err
 			}
-			key = val.(string)
 		} else {
+			val, err = sql.UnwrapAny(ctx, val)
+			if err != nil {
+				return nil, err
+			}
 			if json, ok := val.(sql.JSONWrapper); ok {
 				val, err = json.ToInterface()
 				if err != nil {