Merge pull request #156974 from yuzefovich/blathers/backport-release-25.4-156691

release-25.4: sql: fix a couple of spots where we missed JSONPATH and LTREE

Author: yuzefovich

pkg/sql/logictest/testdata/logic_test/json_builtins

@@ -215,6 +215,17 @@ SELECT to_json((1, 2, 'hello', NULL, NULL))
 ----
 {"f1": 1, "f2": 2, "f3": "hello", "f4": null, "f5": null}
 
+query T
+SELECT to_json(('$'::JSONPATH, '$.foo'::JSONPATH))
+----
+{"f1": "$", "f2": "$.\"foo\""}
+
+skipif config local-mixed-25.2 local-mixed-25.3
+query T
+SELECT to_json(('foo'::LTREE, 'bar'::LTREE))
+----
+{"f1": "foo", "f2": "bar"}
+
 query T
 SELECT to_jsonb(123::INT)
 ----
@@ -613,6 +624,17 @@ SELECT json_build_object('a'::tsvector, 1, 'b'::tsquery, 2)
 ----
 {"'a'": 1, "'b'": 2}
 
+query T
+SELECT json_build_object('$'::JSONPATH, 1)
+----
+{"$": 1}
+
+skipif config local-mixed-25.2 local-mixed-25.3
+query T
+SELECT json_build_object('foo'::LTREE, 2)
+----
+{"foo": 2}
+
 query T
 SELECT json_extract_path('{"a": 1}', 'a')
 ----

pkg/sql/sem/builtins/builtins.go

@@ -12125,8 +12125,9 @@ func asJSONBuildObjectKey(
 		), nil
 	case *tree.DBitArray, *tree.DBool, *tree.DBox2D, *tree.DBytes, *tree.DDate,
 		*tree.DDecimal, *tree.DEnum, *tree.DFloat, *tree.DGeography,
-		*tree.DGeometry, *tree.DIPAddr, *tree.DInt, *tree.DInterval, *tree.DOid,
-		*tree.DOidWrapper, *tree.DPGLSN, *tree.DPGVector, *tree.DTime, *tree.DTimeTZ,
+		*tree.DGeometry, *tree.DIPAddr, *tree.DInt, *tree.DInterval,
+		*tree.DJsonpath, *tree.DLTree, *tree.DOid, *tree.DOidWrapper,
+		*tree.DPGLSN, *tree.DPGVector, *tree.DTime, *tree.DTimeTZ,
 		*tree.DTimestamp, *tree.DTSQuery, *tree.DTSVector, *tree.DUuid, *tree.DVoid:
 		return tree.AsStringWithFlags(d, tree.FmtBareStrings), nil
 	default:

pkg/sql/sem/tree/datum.go

@@ -3877,7 +3877,7 @@ func AsJSON(
 		// This is RFC3339Nano, but without the TZ fields.
 		return json.FromString(formatTime(t.UTC(), "2006-01-02T15:04:05.999999999")), nil
 	case *DDate, *DUuid, *DOid, *DInterval, *DBytes, *DIPAddr, *DTime, *DTimeTZ, *DBitArray, *DBox2D,
-		*DTSVector, *DTSQuery, *DPGLSN, *DPGVector, *DLTree:
+		*DTSVector, *DTSQuery, *DPGLSN, *DPGVector, *DJsonpath, *DLTree:
 		return json.FromString(
 			AsStringWithFlags(t, FmtBareStrings, FmtDataConversionConfig(dcc), FmtLocation(loc)),
 		), nil