diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/jsonfuncs.c | 5 | ||||
| -rw-r--r-- | src/test/regress/expected/jsonb.out | 56 | ||||
| -rw-r--r-- | src/test/regress/expected/jsonb_1.out | 56 | ||||
| -rw-r--r-- | src/test/regress/sql/jsonb.sql | 11 |
4 files changed, 10 insertions, 118 deletions
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c index f87ba77e3eb..c14d3f73fca 100644 --- a/src/backend/utils/adt/jsonfuncs.c +++ b/src/backend/utils/adt/jsonfuncs.c @@ -3400,6 +3400,11 @@ jsonb_delete_idx(PG_FUNCTION_ARGS) (errcode(ERRCODE_INVALID_PARAMETER_VALUE), errmsg("cannot delete from scalar"))); + if (JB_ROOT_IS_OBJECT(in)) + ereport(ERROR, + (errcode(ERRCODE_INVALID_PARAMETER_VALUE), + errmsg("cannot delete from object using integer subscript"))); + if (JB_ROOT_COUNT(in) == 0) PG_RETURN_JSONB(in); diff --git a/src/test/regress/expected/jsonb.out b/src/test/regress/expected/jsonb.out index 412bf97b83f..e6654d47158 100644 --- a/src/test/regress/expected/jsonb.out +++ b/src/test/regress/expected/jsonb.out @@ -3031,54 +3031,6 @@ select '["a","b","c"]'::jsonb - -4; ["a", "b", "c"] (1 row) -select '{"a":1, "b":2, "c":3}'::jsonb - 3; - ?column? --------------------------- - {"a": 1, "b": 2, "c": 3} -(1 row) - -select '{"a":1, "b":2, "c":3}'::jsonb - 2; - ?column? ------------------- - {"a": 1, "b": 2} -(1 row) - -select '{"a":1, "b":2, "c":3}'::jsonb - 1; - ?column? ------------------- - {"a": 1, "c": 3} -(1 row) - -select '{"a":1, "b":2, "c":3}'::jsonb - 0; - ?column? ------------------- - {"b": 2, "c": 3} -(1 row) - -select '{"a":1, "b":2, "c":3}'::jsonb - -1; - ?column? ------------------- - {"a": 1, "b": 2} -(1 row) - -select '{"a":1, "b":2, "c":3}'::jsonb - -2; - ?column? ------------------- - {"a": 1, "c": 3} -(1 row) - -select '{"a":1, "b":2, "c":3}'::jsonb - -3; - ?column? ------------------- - {"b": 2, "c": 3} -(1 row) - -select '{"a":1, "b":2, "c":3}'::jsonb - -4; - ?column? --------------------------- - {"a": 1, "b": 2, "c": 3} -(1 row) - select jsonb_set('{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb, '{n}', '[1,2,3]'); jsonb_set -------------------------------------------------------------------------- @@ -3192,12 +3144,8 @@ select '[]'::jsonb - 'a'; select '"a"'::jsonb - 1; -- error ERROR: cannot delete from scalar -select '{}'::jsonb - 1 ; - ?column? ----------- - {} -(1 row) - +select '{}'::jsonb - 1; -- error +ERROR: cannot delete from object using integer subscript select '[]'::jsonb - 1; ?column? ---------- diff --git a/src/test/regress/expected/jsonb_1.out b/src/test/regress/expected/jsonb_1.out index 4ead74b5726..0a1ec934569 100644 --- a/src/test/regress/expected/jsonb_1.out +++ b/src/test/regress/expected/jsonb_1.out @@ -3031,54 +3031,6 @@ select '["a","b","c"]'::jsonb - -4; ["a", "b", "c"] (1 row) -select '{"a":1, "b":2, "c":3}'::jsonb - 3; - ?column? --------------------------- - {"a": 1, "b": 2, "c": 3} -(1 row) - -select '{"a":1, "b":2, "c":3}'::jsonb - 2; - ?column? ------------------- - {"a": 1, "b": 2} -(1 row) - -select '{"a":1, "b":2, "c":3}'::jsonb - 1; - ?column? ------------------- - {"a": 1, "c": 3} -(1 row) - -select '{"a":1, "b":2, "c":3}'::jsonb - 0; - ?column? ------------------- - {"b": 2, "c": 3} -(1 row) - -select '{"a":1, "b":2, "c":3}'::jsonb - -1; - ?column? ------------------- - {"a": 1, "b": 2} -(1 row) - -select '{"a":1, "b":2, "c":3}'::jsonb - -2; - ?column? ------------------- - {"a": 1, "c": 3} -(1 row) - -select '{"a":1, "b":2, "c":3}'::jsonb - -3; - ?column? ------------------- - {"b": 2, "c": 3} -(1 row) - -select '{"a":1, "b":2, "c":3}'::jsonb - -4; - ?column? --------------------------- - {"a": 1, "b": 2, "c": 3} -(1 row) - select jsonb_set('{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb, '{n}', '[1,2,3]'); jsonb_set -------------------------------------------------------------------------- @@ -3192,12 +3144,8 @@ select '[]'::jsonb - 'a'; select '"a"'::jsonb - 1; -- error ERROR: cannot delete from scalar -select '{}'::jsonb - 1 ; - ?column? ----------- - {} -(1 row) - +select '{}'::jsonb - 1; -- error +ERROR: cannot delete from object using integer subscript select '[]'::jsonb - 1; ?column? ---------- diff --git a/src/test/regress/sql/jsonb.sql b/src/test/regress/sql/jsonb.sql index 2abec221b43..29c82a2a62c 100644 --- a/src/test/regress/sql/jsonb.sql +++ b/src/test/regress/sql/jsonb.sql @@ -738,15 +738,6 @@ select '["a","b","c"]'::jsonb - -2; select '["a","b","c"]'::jsonb - -3; select '["a","b","c"]'::jsonb - -4; -select '{"a":1, "b":2, "c":3}'::jsonb - 3; -select '{"a":1, "b":2, "c":3}'::jsonb - 2; -select '{"a":1, "b":2, "c":3}'::jsonb - 1; -select '{"a":1, "b":2, "c":3}'::jsonb - 0; -select '{"a":1, "b":2, "c":3}'::jsonb - -1; -select '{"a":1, "b":2, "c":3}'::jsonb - -2; -select '{"a":1, "b":2, "c":3}'::jsonb - -3; -select '{"a":1, "b":2, "c":3}'::jsonb - -4; - select jsonb_set('{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb, '{n}', '[1,2,3]'); select jsonb_set('{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb, '{b,-1}', '[1,2,3]'); select jsonb_set('{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb, '{d,1,0}', '[1,2,3]'); @@ -775,7 +766,7 @@ select '"a"'::jsonb - 'a'; -- error select '{}'::jsonb - 'a'; select '[]'::jsonb - 'a'; select '"a"'::jsonb - 1; -- error -select '{}'::jsonb - 1 ; +select '{}'::jsonb - 1; -- error select '[]'::jsonb - 1; select '"a"'::jsonb - '{a}'::text[]; -- error select '{}'::jsonb - '{a}'::text[]; |