Commit4ebe351

committed

Allow empty string object keys in json_object().

This makes the behaviour consistent with the json parser, otherjson-generating functions, and the JSON standards.

1 parentd7cdf6e commit4ebe351Copy full SHA for 4ebe351

File tree

+13

-13

lines changed

+13

-13

lines changed

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -2184,10 +2184,6 @@ json_object(PG_FUNCTION_ARGS)`
`2184`	`2184`	`errmsg("null value not allowed for object key")));`
`2185`	`2185`
`2186`	`2186`	`v=TextDatumGetCString(in_datums[i*2]);`
`2187`		`-if (v[0]=='\0')`
`2188`		`-ereport(ERROR,`
`2189`		`-(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),`
`2190`		`-errmsg("empty value not allowed for object key")));`
`2191`	`2187`	`if (i>0)`
`2192`	`2188`	`appendStringInfoString(&result,", ");`
`2193`	`2189`	`escape_json(&result,v);`
`@@ -2272,10 +2268,6 @@ json_object_two_arg(PG_FUNCTION_ARGS)`
`2272`	`2268`	`errmsg("null value not allowed for object key")));`
`2273`	`2269`
`2274`	`2270`	`v=TextDatumGetCString(key_datums[i]);`
`2275`		`-if (v[0]=='\0')`
`2276`		`-ereport(ERROR,`
`2277`		`-(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),`
`2278`		`-errmsg("empty value not allowed for object key")));`
`2279`	`2271`	`if (i>0)`
`2280`	`2272`	`appendStringInfoString(&result,", ");`
`2281`	`2273`	`escape_json(&result,v);`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1213,9 +1213,13 @@ ERROR: mismatched array dimensions`
`1213`	`1213`	`-- null key error`
`1214`	`1214`	`select json_object('{a,b,NULL,"d e f"}','{1,2,3,"a b c"}');`
`1215`	`1215`	`ERROR: null value not allowed for object key`
`1216`		`--- empty keyerror`
	`1216`	`+-- empty keyis allowed`
`1217`	`1217`	`select json_object('{a,b,"","d e f"}','{1,2,3,"a b c"}');`
`1218`		`-ERROR: empty value not allowed for object key`
	`1218`	`+ json_object`
	`1219`	`+-----------------------------------------------------`
	`1220`	`+ {"a" : "1", "b" : "2", "" : "3", "d e f" : "a b c"}`
	`1221`	`+(1 row)`
	`1222`	`+`
`1219`	`1223`	`-- json_to_record and json_to_recordset`
`1220`	`1224`	`select * from json_to_record('{"a":1,"b":"foo","c":"bar"}')`
`1221`	`1225`	`as x(a int, b text, d text);`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1209,9 +1209,13 @@ ERROR: mismatched array dimensions`
`1209`	`1209`	`-- null key error`
`1210`	`1210`	`select json_object('{a,b,NULL,"d e f"}','{1,2,3,"a b c"}');`
`1211`	`1211`	`ERROR: null value not allowed for object key`
`1212`		`--- empty keyerror`
	`1212`	`+-- empty keyis allowed`
`1213`	`1213`	`select json_object('{a,b,"","d e f"}','{1,2,3,"a b c"}');`
`1214`		`-ERROR: empty value not allowed for object key`
	`1214`	`+ json_object`
	`1215`	`+-----------------------------------------------------`
	`1216`	`+ {"a" : "1", "b" : "2", "" : "3", "d e f" : "a b c"}`
	`1217`	`+(1 row)`
	`1218`	`+`
`1215`	`1219`	`-- json_to_record and json_to_recordset`
`1216`	`1220`	`select * from json_to_record('{"a":1,"b":"foo","c":"bar"}')`
`1217`	`1221`	`as x(a int, b text, d text);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ select json_object('{a,b,c,"d e f"}','{1,2,3,"a b c",g}');`
`435`	`435`
`436`	`436`	`select json_object('{a,b,NULL,"d e f"}','{1,2,3,"a b c"}');`
`437`	`437`
`438`		`--- empty keyerror`
	`438`	`+-- empty keyis allowed`
`439`	`439`
`440`	`440`	`select json_object('{a,b,"","d e f"}','{1,2,3,"a b c"}');`
`441`	`441`

Comments

(0)