mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-28 21:01:48 +02:00
Fix json_to_record() bug with nested objects.
A thinko concerning nesting depth caused json_to_record() to produce bogus output if a field of its input object contained a sub-object with a field name matching one of the requested output column names. Per bug #13996 from Johann Visagie. I added a regression test case based on his example, plus parallel tests for json_to_recordset, jsonb_to_record, jsonb_to_recordset. The latter three do not exhibit the same bug (which suggests that we may be missing some opportunities to share code...) but testing seems like a good idea in any case. Back-patch to 9.4 where these functions were introduced.
This commit is contained in:
parent
eb43e851d6
commit
a9d199f6d3
@ -2438,7 +2438,7 @@ hash_object_field_end(void *state, char *fname, bool isnull)
|
|||||||
/*
|
/*
|
||||||
* Ignore nested fields.
|
* Ignore nested fields.
|
||||||
*/
|
*/
|
||||||
if (_state->lex->lex_level > 2)
|
if (_state->lex->lex_level > 1)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1599,6 +1599,22 @@ select * from json_to_recordset('[{"a":1,"b":{"d":"foo"},"c":true},{"a":2,"c":fa
|
|||||||
2 | {"d":"bar"} | f
|
2 | {"d":"bar"} | f
|
||||||
(2 rows)
|
(2 rows)
|
||||||
|
|
||||||
|
select *, c is null as c_is_null
|
||||||
|
from json_to_record('{"a":1, "b":{"c":16, "d":2}, "x":8}'::json)
|
||||||
|
as t(a int, b json, c text, x int);
|
||||||
|
a | b | c | x | c_is_null
|
||||||
|
---+-----------------+---+---+-----------
|
||||||
|
1 | {"c":16, "d":2} | | 8 | t
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
select *, c is null as c_is_null
|
||||||
|
from json_to_recordset('[{"a":1, "b":{"c":16, "d":2}, "x":8}]'::json)
|
||||||
|
as t(a int, b json, c text, x int);
|
||||||
|
a | b | c | x | c_is_null
|
||||||
|
---+-----------------+---+---+-----------
|
||||||
|
1 | {"c":16, "d":2} | | 8 | t
|
||||||
|
(1 row)
|
||||||
|
|
||||||
-- json_strip_nulls
|
-- json_strip_nulls
|
||||||
select json_strip_nulls(null);
|
select json_strip_nulls(null);
|
||||||
json_strip_nulls
|
json_strip_nulls
|
||||||
|
@ -2001,6 +2001,22 @@ select * from jsonb_to_recordset('[{"a":1,"b":"foo","d":false},{"a":2,"b":"bar",
|
|||||||
2 | bar | t
|
2 | bar | t
|
||||||
(2 rows)
|
(2 rows)
|
||||||
|
|
||||||
|
select *, c is null as c_is_null
|
||||||
|
from jsonb_to_record('{"a":1, "b":{"c":16, "d":2}, "x":8}'::jsonb)
|
||||||
|
as t(a int, b jsonb, c text, x int);
|
||||||
|
a | b | c | x | c_is_null
|
||||||
|
---+-------------------+---+---+-----------
|
||||||
|
1 | {"c": 16, "d": 2} | | 8 | t
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
select *, c is null as c_is_null
|
||||||
|
from jsonb_to_recordset('[{"a":1, "b":{"c":16, "d":2}, "x":8}]'::jsonb)
|
||||||
|
as t(a int, b jsonb, c text, x int);
|
||||||
|
a | b | c | x | c_is_null
|
||||||
|
---+-------------------+---+---+-----------
|
||||||
|
1 | {"c": 16, "d": 2} | | 8 | t
|
||||||
|
(1 row)
|
||||||
|
|
||||||
-- indexing
|
-- indexing
|
||||||
SELECT count(*) FROM testjsonb WHERE j @> '{"wait":null}';
|
SELECT count(*) FROM testjsonb WHERE j @> '{"wait":null}';
|
||||||
count
|
count
|
||||||
|
@ -519,6 +519,13 @@ select * from json_to_recordset('[{"a":1,"b":"foo","d":false},{"a":2,"b":"bar","
|
|||||||
select * from json_to_recordset('[{"a":1,"b":{"d":"foo"},"c":true},{"a":2,"c":false,"b":{"d":"bar"}}]')
|
select * from json_to_recordset('[{"a":1,"b":{"d":"foo"},"c":true},{"a":2,"c":false,"b":{"d":"bar"}}]')
|
||||||
as x(a int, b json, c boolean);
|
as x(a int, b json, c boolean);
|
||||||
|
|
||||||
|
select *, c is null as c_is_null
|
||||||
|
from json_to_record('{"a":1, "b":{"c":16, "d":2}, "x":8}'::json)
|
||||||
|
as t(a int, b json, c text, x int);
|
||||||
|
|
||||||
|
select *, c is null as c_is_null
|
||||||
|
from json_to_recordset('[{"a":1, "b":{"c":16, "d":2}, "x":8}]'::json)
|
||||||
|
as t(a int, b json, c text, x int);
|
||||||
|
|
||||||
-- json_strip_nulls
|
-- json_strip_nulls
|
||||||
|
|
||||||
|
@ -508,6 +508,14 @@ select * from jsonb_to_record('{"a":1,"b":"foo","c":"bar"}')
|
|||||||
select * from jsonb_to_recordset('[{"a":1,"b":"foo","d":false},{"a":2,"b":"bar","c":true}]')
|
select * from jsonb_to_recordset('[{"a":1,"b":"foo","d":false},{"a":2,"b":"bar","c":true}]')
|
||||||
as x(a int, b text, c boolean);
|
as x(a int, b text, c boolean);
|
||||||
|
|
||||||
|
select *, c is null as c_is_null
|
||||||
|
from jsonb_to_record('{"a":1, "b":{"c":16, "d":2}, "x":8}'::jsonb)
|
||||||
|
as t(a int, b jsonb, c text, x int);
|
||||||
|
|
||||||
|
select *, c is null as c_is_null
|
||||||
|
from jsonb_to_recordset('[{"a":1, "b":{"c":16, "d":2}, "x":8}]'::jsonb)
|
||||||
|
as t(a int, b jsonb, c text, x int);
|
||||||
|
|
||||||
-- indexing
|
-- indexing
|
||||||
SELECT count(*) FROM testjsonb WHERE j @> '{"wait":null}';
|
SELECT count(*) FROM testjsonb WHERE j @> '{"wait":null}';
|
||||||
SELECT count(*) FROM testjsonb WHERE j @> '{"wait":"CC"}';
|
SELECT count(*) FROM testjsonb WHERE j @> '{"wait":"CC"}';
|
||||||
|
Loading…
Reference in New Issue
Block a user