1
0
mirror of https://github.com/postgres/postgres.git synced 2025-07-03 20:02:46 +03:00

Fix conversion of JSON strings to JSON output columns in json_to_record().

json_to_record(), when an output column is declared as type json or jsonb,
should emit the corresponding field of the input JSON object.  But it got
this slightly wrong when the field is just a string literal: it failed to
escape the contents of the string.  That typically resulted in syntax
errors if the string contained any double quotes or backslashes.

jsonb_to_record() handles such cases correctly, but I added corresponding
test cases for it too, to prevent future backsliding.

Improve the documentation, as it provided only a very hand-wavy
description of the conversion rules used by these functions.

Per bug report from Robert Vollmert.  Back-patch to v10 where the
error was introduced (by commit cf35346e8).

Note that PG 9.4 - 9.6 also get this case wrong, but differently so:
they feed the de-escaped contents of the string literal to json[b]_in.
That behavior is less obviously wrong, so possibly it's being depended on
in the field, so I won't risk trying to make the older branches behave
like the newer ones.

Discussion: https://postgr.es/m/D6921B37-BD8E-4664-8D5F-DB3525765DCD@vllmrt.net
This commit is contained in:
Tom Lane
2019-06-11 13:33:08 -04:00
parent 9f05c44ba4
commit 6f34fcbbd5
6 changed files with 167 additions and 44 deletions

View File

@ -2276,6 +2276,42 @@ select * from json_to_record('{"ia2": [[[1], [2], [3]]]}') as x(ia2 int4[][]);
{{{1},{2},{3}}}
(1 row)
select * from json_to_record('{"out": {"key": 1}}') as x(out json);
out
------------
{"key": 1}
(1 row)
select * from json_to_record('{"out": [{"key": 1}]}') as x(out json);
out
--------------
[{"key": 1}]
(1 row)
select * from json_to_record('{"out": "{\"key\": 1}"}') as x(out json);
out
----------------
"{\"key\": 1}"
(1 row)
select * from json_to_record('{"out": {"key": 1}}') as x(out jsonb);
out
------------
{"key": 1}
(1 row)
select * from json_to_record('{"out": [{"key": 1}]}') as x(out jsonb);
out
--------------
[{"key": 1}]
(1 row)
select * from json_to_record('{"out": "{\"key\": 1}"}') as x(out jsonb);
out
----------------
"{\"key\": 1}"
(1 row)
-- json_strip_nulls
select json_strip_nulls(null);
json_strip_nulls

View File

@ -2652,6 +2652,42 @@ select * from jsonb_to_record('{"ia2": [[[1], [2], [3]]]}') as x(ia2 int4[][]);
{{{1},{2},{3}}}
(1 row)
select * from jsonb_to_record('{"out": {"key": 1}}') as x(out json);
out
------------
{"key": 1}
(1 row)
select * from jsonb_to_record('{"out": [{"key": 1}]}') as x(out json);
out
--------------
[{"key": 1}]
(1 row)
select * from jsonb_to_record('{"out": "{\"key\": 1}"}') as x(out json);
out
----------------
"{\"key\": 1}"
(1 row)
select * from jsonb_to_record('{"out": {"key": 1}}') as x(out jsonb);
out
------------
{"key": 1}
(1 row)
select * from jsonb_to_record('{"out": [{"key": 1}]}') as x(out jsonb);
out
--------------
[{"key": 1}]
(1 row)
select * from jsonb_to_record('{"out": "{\"key\": 1}"}') as x(out jsonb);
out
----------------
"{\"key\": 1}"
(1 row)
-- test type info caching in jsonb_populate_record()
CREATE TEMP TABLE jsbpoptest (js jsonb);
INSERT INTO jsbpoptest

View File

@ -742,6 +742,13 @@ select * from json_to_record('{"ia2": [1, 2, 3]}') as x(ia2 int[][]);
select * from json_to_record('{"ia2": [[1, 2], [3, 4]]}') as x(ia2 int4[][]);
select * from json_to_record('{"ia2": [[[1], [2], [3]]]}') as x(ia2 int4[][]);
select * from json_to_record('{"out": {"key": 1}}') as x(out json);
select * from json_to_record('{"out": [{"key": 1}]}') as x(out json);
select * from json_to_record('{"out": "{\"key\": 1}"}') as x(out json);
select * from json_to_record('{"out": {"key": 1}}') as x(out jsonb);
select * from json_to_record('{"out": [{"key": 1}]}') as x(out jsonb);
select * from json_to_record('{"out": "{\"key\": 1}"}') as x(out jsonb);
-- json_strip_nulls
select json_strip_nulls(null);

View File

@ -709,6 +709,13 @@ select * from jsonb_to_record('{"ia2": [1, 2, 3]}') as x(ia2 int[][]);
select * from jsonb_to_record('{"ia2": [[1, 2], [3, 4]]}') as x(ia2 int4[][]);
select * from jsonb_to_record('{"ia2": [[[1], [2], [3]]]}') as x(ia2 int4[][]);
select * from jsonb_to_record('{"out": {"key": 1}}') as x(out json);
select * from jsonb_to_record('{"out": [{"key": 1}]}') as x(out json);
select * from jsonb_to_record('{"out": "{\"key\": 1}"}') as x(out json);
select * from jsonb_to_record('{"out": {"key": 1}}') as x(out jsonb);
select * from jsonb_to_record('{"out": [{"key": 1}]}') as x(out jsonb);
select * from jsonb_to_record('{"out": "{\"key\": 1}"}') as x(out jsonb);
-- test type info caching in jsonb_populate_record()
CREATE TEMP TABLE jsbpoptest (js jsonb);