git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Fix jsonpath existense checking of missing variables

author Alexander Korotkov <akorotkov@postgresql.org>

2023年1月12日 15:16:34 +0000 (18:16 +0300)

committer Alexander Korotkov <akorotkov@postgresql.org>

2023年1月12日 15:16:34 +0000 (18:16 +0300)

The current jsonpath code assumes that the referenced variable always exists.
It could only throw an error at the value valuation time. At the same time
existence checking assumes variable is present without valuation, and error
suppression doesn't work for missing variables.

This commit makes existense checking trigger an error for missing variables.
This makes the overall behavior consistent.

Backpatch to 12 where jsonpath was introduced.

Reported-by: David G. Johnston
Discussion: https://postgr.es/m/CAKFQuwbeytffJkVnEqDyLZ%3DrQsznoTh1OgDoOF3VmOMkxcTMjA%40mail.gmail.com
Author: Alexander Korotkov, David G. Johnston
Backpatch-through: 12

src/backend/utils/adt/jsonpath_exec.c patch | blob | blame | history

src/test/regress/expected/jsonb_jsonpath.out patch | blob | blame | history

src/test/regress/sql/jsonb_jsonpath.sql patch | blob | blame | history

diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c

index 350e543fd9c2910abef05c064eba87da58b3722b..b561f0e7e803f0e5a546ad118a47f625225b9708 100644 (file)

--- a/src/backend/utils/adt/jsonpath_exec.c

+++ b/src/backend/utils/adt/jsonpath_exec.c

@@ -959,9 +959,13 @@ executeItemOptUnwrapTarget(JsonPathExecContext *cxt, JsonPathItem *jsp,

JsonbValue *v;

bool hasNext = jspGetNext(jsp, &elem);

- if (!hasNext && !found)

+ if (!hasNext && !found && jsp->type != jpiVariable)

{

- res = jperOk; /* skip evaluation */

+ /*

+ * Skip evaluation, but not for variables. We must

+ * trigger an error for the missing variable.

+ */

+ res = jperOk;

break;

}

diff --git a/src/test/regress/expected/jsonb_jsonpath.out b/src/test/regress/expected/jsonb_jsonpath.out

index 508ddd797ed59e40c51d3d7417b5e396ea4a27b2..328a6b391990f3520634c54e812d73ea239aa564 100644 (file)

--- a/src/test/regress/expected/jsonb_jsonpath.out

+++ b/src/test/regress/expected/jsonb_jsonpath.out

@@ -2212,6 +2212,14 @@ SELECT jsonb_path_query('[{"a": 1}, {"a": 2}]', '$[*] ? (@.a > 10)');

------------------

(0 rows)

+SELECT jsonb_path_query('[{"a": 1}]', '$undefined_var');

+ERROR: could not find jsonpath variable "undefined_var"

+SELECT jsonb_path_query('[{"a": 1}]', 'false');

+ jsonb_path_query

+------------------

+ false

+(1 row)

SELECT jsonb_path_query_array('[{"a": 1}, {"a": 2}, {}]', 'strict $[*].a');

ERROR: JSON object does not contain key "a"

SELECT jsonb_path_query_array('[{"a": 1}, {"a": 2}]', '$[*].a');

@@ -2282,6 +2290,14 @@ SELECT jsonb_path_query_first('[{"a": 1}, {"a": 2}, {"a": 3}, {"a": 5}]', '$[*].

(1 row)

+SELECT jsonb_path_query_first('[{"a": 1}]', '$undefined_var');

+ERROR: could not find jsonpath variable "undefined_var"

+SELECT jsonb_path_query_first('[{"a": 1}]', 'false');

+ jsonb_path_query_first

+------------------------

+ false

+(1 row)

SELECT jsonb '[{"a": 1}, {"a": 2}]' @? '$[*].a ? (@ > 1)';

?column?

----------

@@ -2312,6 +2328,14 @@ SELECT jsonb_path_exists('[{"a": 1}, {"a": 2}, {"a": 3}, {"a": 5}]', '$[*] ? (@.

(1 row)

+SELECT jsonb_path_exists('[{"a": 1}]', '$undefined_var');

+ERROR: could not find jsonpath variable "undefined_var"

+SELECT jsonb_path_exists('[{"a": 1}]', 'false');

+ jsonb_path_exists

+-------------------

+ t

+(1 row)

SELECT jsonb_path_match('true', '$', silent => false);

jsonb_path_match

------------------

@@ -2374,6 +2398,14 @@ SELECT jsonb_path_match('[{"a": 1}, {"a": 2}]', '$[*].a > 1');

(1 row)

+SELECT jsonb_path_match('[{"a": 1}]', '$undefined_var');

+ERROR: could not find jsonpath variable "undefined_var"

+SELECT jsonb_path_match('[{"a": 1}]', 'false');

+ jsonb_path_match

+------------------

+ f

+(1 row)

-- test string comparison (Unicode codepoint collation)

WITH str(j, num) AS

(

diff --git a/src/test/regress/sql/jsonb_jsonpath.sql b/src/test/regress/sql/jsonb_jsonpath.sql

index 60f73cb05906c546ed847e8f937f859c8d37d4bc..bd025077d520d0286dce3f968a9d89f3a55c5424 100644 (file)

--- a/src/test/regress/sql/jsonb_jsonpath.sql

+++ b/src/test/regress/sql/jsonb_jsonpath.sql

@@ -532,6 +532,8 @@ set time zone default;

SELECT jsonb_path_query('[{"a": 1}, {"a": 2}]', '$[*]');

SELECT jsonb_path_query('[{"a": 1}, {"a": 2}]', '$[*] ? (@.a > 10)');

+SELECT jsonb_path_query('[{"a": 1}]', '$undefined_var');

+SELECT jsonb_path_query('[{"a": 1}]', 'false');

SELECT jsonb_path_query_array('[{"a": 1}, {"a": 2}, {}]', 'strict $[*].a');

SELECT jsonb_path_query_array('[{"a": 1}, {"a": 2}]', '$[*].a');

@@ -547,12 +549,16 @@ SELECT jsonb_path_query_first('[{"a": 1}, {"a": 2}]', '$[*].a ? (@ == 1)');

SELECT jsonb_path_query_first('[{"a": 1}, {"a": 2}]', '$[*].a ? (@ > 10)');

SELECT jsonb_path_query_first('[{"a": 1}, {"a": 2}, {"a": 3}, {"a": 5}]', '$[*].a ? (@ > $min && @ < $max)', vars => '{"min": 1, "max": 4}');

SELECT jsonb_path_query_first('[{"a": 1}, {"a": 2}, {"a": 3}, {"a": 5}]', '$[*].a ? (@ > $min && @ < $max)', vars => '{"min": 3, "max": 4}');

+SELECT jsonb_path_query_first('[{"a": 1}]', '$undefined_var');

+SELECT jsonb_path_query_first('[{"a": 1}]', 'false');

SELECT jsonb '[{"a": 1}, {"a": 2}]' @? '$[*].a ? (@ > 1)';

SELECT jsonb '[{"a": 1}, {"a": 2}]' @? '$[*] ? (@.a > 2)';

SELECT jsonb_path_exists('[{"a": 1}, {"a": 2}]', '$[*].a ? (@ > 1)');

SELECT jsonb_path_exists('[{"a": 1}, {"a": 2}, {"a": 3}, {"a": 5}]', '$[*] ? (@.a > $min && @.a < $max)', vars => '{"min": 1, "max": 4}');

SELECT jsonb_path_exists('[{"a": 1}, {"a": 2}, {"a": 3}, {"a": 5}]', '$[*] ? (@.a > $min && @.a < $max)', vars => '{"min": 3, "max": 4}');

+SELECT jsonb_path_exists('[{"a": 1}]', '$undefined_var');

+SELECT jsonb_path_exists('[{"a": 1}]', 'false');

SELECT jsonb_path_match('true', '$', silent => false);

SELECT jsonb_path_match('false', '$', silent => false);

@@ -569,6 +575,8 @@ SELECT jsonb_path_match('[true, true]', '$[*]', silent => false);

SELECT jsonb '[{"a": 1}, {"a": 2}]' @@ '$[*].a > 1';

SELECT jsonb '[{"a": 1}, {"a": 2}]' @@ '$[*].a > 2';

SELECT jsonb_path_match('[{"a": 1}, {"a": 2}]', '$[*].a > 1');

+SELECT jsonb_path_match('[{"a": 1}]', '$undefined_var');

+SELECT jsonb_path_match('[{"a": 1}]', 'false');

-- test string comparison (Unicode codepoint collation)

WITH str(j, num) AS

This is the main PostgreSQL git repository.

RSS Atom