Commitc80da1c

Nikita Glukhov

committed

Fix jsonb_populate_record() behavior on non-objects

1 parentd6b881a commitc80da1cCopy full SHA for c80da1c

File tree

+15

-15

lines changed

+15

-15

lines changed

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2681,7 +2681,19 @@ JsValueToJsObject(JsValue jsv, JsObject jso)`
`2681`	`2681`	`JsonContainerIsObject(jbv->val.binary.data))`
`2682`	`2682`	`jso->val.jsonb_cont=jbv->val.binary.data;`
`2683`	`2683`	`else`
	`2684`	`+{`
	`2685`	`+boolis_scalar=IsAJsonbScalar(jbv)\|\|`
	`2686`	`+(jbv->type==jbvBinary&&`
	`2687`	`+JsonContainerIsScalar(jbv->val.binary.data));`
	`2688`	`+`
	`2689`	`+ereport(ERROR,`
	`2690`	`+(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
	`2691`	`+errmsg(is_scalar ?"cannot call %s on a scalar" :`
	`2692`	`+"cannot call %s on an array",`
	`2693`	`+"populate_composite")));`
	`2694`	`+`
`2684`	`2695`	`jso->val.jsonb_cont=NULL;`
	`2696`	`+}`
`2685`	`2697`	`}`
`2686`	`2698`	`}`
`2687`	`2699`

Lines changed: 3 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -2276,17 +2276,9 @@ SELECT jsa FROM jsonb_populate_record(NULL::jsbrec, '{"jsa": ["aaa", null, [1, 2`
`2276`	`2276`	`(1 row)`
`2277`	`2277`
`2278`	`2278`	`SELECT rec FROM jsonb_populate_record(NULL::jsbrec, '{"rec": 123}') q;`
`2279`		`- rec`
`2280`		`-------`
`2281`		`- (,,)`
`2282`		`-(1 row)`
`2283`		`-`
	`2279`	`+ERROR: cannot call populate_composite on a scalar`
`2284`	`2280`	`SELECT rec FROM jsonb_populate_record(NULL::jsbrec, '{"rec": [1, 2]}') q;`
`2285`		`- rec`
`2286`		`-------`
`2287`		`- (,,)`
`2288`		`-(1 row)`
`2289`		`-`
	`2281`	`+ERROR: cannot call populate_composite on an array`
`2290`	`2282`	`SELECT rec FROM jsonb_populate_record(NULL::jsbrec, '{"rec": {"a": "abc", "c": "01.02.2003", "x": 43.2}}') q;`
`2291`	`2283`	`rec`
`2292`	`2284`	`-----------------------------------`
`@@ -2303,11 +2295,7 @@ SELECT reca FROM jsonb_populate_record(NULL::jsbrec, '{"reca": 123}') q;`
`2303`	`2295`	`ERROR: expected json array`
`2304`	`2296`	`HINT: see the value of key "reca"`
`2305`	`2297`	`SELECT reca FROM jsonb_populate_record(NULL::jsbrec, '{"reca": [1, 2]}') q;`
`2306`		`- reca`
`2307`		`------------------`
`2308`		`- {"(,,)","(,,)"}`
`2309`		`-(1 row)`
`2310`		`-`
	`2298`	`+ERROR: cannot call populate_composite on a scalar`
`2311`	`2299`	`SELECT reca FROM jsonb_populate_record(NULL::jsbrec, '{"reca": [{"a": "abc", "b": 456}, null, {"c": "01.02.2003", "x": 43.2}]}') q;`
`2312`	`2300`	`reca`
`2313`	`2301`	`--------------------------------------------------------`

Comments

(0)