aboutsummaryrefslogtreecommitdiff
path: root/src/test/regress
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/regress')
-rw-r--r--src/test/regress/expected/jsonb_jsonpath.out2
-rw-r--r--src/test/regress/expected/jsonpath.out168
-rw-r--r--src/test/regress/expected/jsonpath_encoding.out249
-rw-r--r--src/test/regress/expected/jsonpath_encoding_1.out237
-rw-r--r--src/test/regress/parallel_schedule2
-rw-r--r--src/test/regress/serial_schedule1
-rw-r--r--src/test/regress/sql/jsonb_jsonpath.sql2
-rw-r--r--src/test/regress/sql/jsonpath.sql30
-rw-r--r--src/test/regress/sql/jsonpath_encoding.sql71
9 files changed, 759 insertions, 3 deletions
diff --git a/src/test/regress/expected/jsonb_jsonpath.out b/src/test/regress/expected/jsonb_jsonpath.out
index e604bae6a3f..4a84d9157fa 100644
--- a/src/test/regress/expected/jsonb_jsonpath.out
+++ b/src/test/regress/expected/jsonb_jsonpath.out
@@ -1297,7 +1297,7 @@ select jsonb_path_query('null', 'true.type()');
"boolean"
(1 row)
-select jsonb_path_query('null', '123.type()');
+select jsonb_path_query('null', '(123).type()');
jsonb_path_query
------------------
"number"
diff --git a/src/test/regress/expected/jsonpath.out b/src/test/regress/expected/jsonpath.out
index baaf9e36670..b7de4915038 100644
--- a/src/test/regress/expected/jsonpath.out
+++ b/src/test/regress/expected/jsonpath.out
@@ -365,6 +365,18 @@ select '1.type()'::jsonpath;
1.type()
(1 row)
+select '(1).type()'::jsonpath;
+ jsonpath
+----------
+ 1.type()
+(1 row)
+
+select '1.2.type()'::jsonpath;
+ jsonpath
+------------
+ 1.2.type()
+(1 row)
+
select '"aaa".type()'::jsonpath;
jsonpath
--------------
@@ -804,3 +816,159 @@ select '$ ? (@.a < +10.1e+1)'::jsonpath;
$?(@."a" < 101)
(1 row)
+select '0'::jsonpath;
+ jsonpath
+----------
+ 0
+(1 row)
+
+select '00'::jsonpath;
+ jsonpath
+----------
+ 0
+(1 row)
+
+select '0.0'::jsonpath;
+ jsonpath
+----------
+ 0.0
+(1 row)
+
+select '0.000'::jsonpath;
+ jsonpath
+----------
+ 0.000
+(1 row)
+
+select '0.000e1'::jsonpath;
+ jsonpath
+----------
+ 0.00
+(1 row)
+
+select '0.000e2'::jsonpath;
+ jsonpath
+----------
+ 0.0
+(1 row)
+
+select '0.000e3'::jsonpath;
+ jsonpath
+----------
+ 0
+(1 row)
+
+select '0.0010'::jsonpath;
+ jsonpath
+----------
+ 0.0010
+(1 row)
+
+select '0.0010e-1'::jsonpath;
+ jsonpath
+----------
+ 0.00010
+(1 row)
+
+select '0.0010e+1'::jsonpath;
+ jsonpath
+----------
+ 0.010
+(1 row)
+
+select '0.0010e+2'::jsonpath;
+ jsonpath
+----------
+ 0.10
+(1 row)
+
+select '1e'::jsonpath;
+ERROR: bad jsonpath representation
+LINE 1: select '1e'::jsonpath;
+ ^
+DETAIL: Floating point number is invalid at or near "1e"
+select '1.e'::jsonpath;
+ jsonpath
+----------
+ 1."e"
+(1 row)
+
+select '1.2e'::jsonpath;
+ERROR: bad jsonpath representation
+LINE 1: select '1.2e'::jsonpath;
+ ^
+DETAIL: Floating point number is invalid at or near "1.2e"
+select '1.2.e'::jsonpath;
+ jsonpath
+----------
+ 1.2."e"
+(1 row)
+
+select '(1.2).e'::jsonpath;
+ jsonpath
+----------
+ 1.2."e"
+(1 row)
+
+select '1e3'::jsonpath;
+ jsonpath
+----------
+ 1000
+(1 row)
+
+select '1.e3'::jsonpath;
+ jsonpath
+----------
+ 1."e3"
+(1 row)
+
+select '1.e3.e'::jsonpath;
+ jsonpath
+------------
+ 1."e3"."e"
+(1 row)
+
+select '1.e3.e4'::jsonpath;
+ jsonpath
+-------------
+ 1."e3"."e4"
+(1 row)
+
+select '1.2e3'::jsonpath;
+ jsonpath
+----------
+ 1200
+(1 row)
+
+select '1.2.e3'::jsonpath;
+ jsonpath
+----------
+ 1.2."e3"
+(1 row)
+
+select '(1.2).e3'::jsonpath;
+ jsonpath
+----------
+ 1.2."e3"
+(1 row)
+
+select '1..e'::jsonpath;
+ERROR: bad jsonpath representation
+LINE 1: select '1..e'::jsonpath;
+ ^
+DETAIL: syntax error, unexpected '.' at or near "."
+select '1..e3'::jsonpath;
+ERROR: bad jsonpath representation
+LINE 1: select '1..e3'::jsonpath;
+ ^
+DETAIL: syntax error, unexpected '.' at or near "."
+select '(1.).e'::jsonpath;
+ERROR: bad jsonpath representation
+LINE 1: select '(1.).e'::jsonpath;
+ ^
+DETAIL: syntax error, unexpected ')' at or near ")"
+select '(1.).e3'::jsonpath;
+ERROR: bad jsonpath representation
+LINE 1: select '(1.).e3'::jsonpath;
+ ^
+DETAIL: syntax error, unexpected ')' at or near ")"
diff --git a/src/test/regress/expected/jsonpath_encoding.out b/src/test/regress/expected/jsonpath_encoding.out
new file mode 100644
index 00000000000..6d828d17248
--- /dev/null
+++ b/src/test/regress/expected/jsonpath_encoding.out
@@ -0,0 +1,249 @@
+-- encoding-sensitive tests for jsonpath
+-- checks for double-quoted values
+-- basic unicode input
+SELECT '"\u"'::jsonpath; -- ERROR, incomplete escape
+ERROR: bad jsonpath representation
+LINE 1: SELECT '"\u"'::jsonpath;
+ ^
+DETAIL: Unicode sequence is invalid at or near "\u"
+SELECT '"\u00"'::jsonpath; -- ERROR, incomplete escape
+ERROR: bad jsonpath representation
+LINE 1: SELECT '"\u00"'::jsonpath;
+ ^
+DETAIL: Unicode sequence is invalid at or near "\u00"
+SELECT '"\u000g"'::jsonpath; -- ERROR, g is not a hex digit
+ERROR: bad jsonpath representation
+LINE 1: SELECT '"\u000g"'::jsonpath;
+ ^
+DETAIL: Unicode sequence is invalid at or near "\u000"
+SELECT '"\u0000"'::jsonpath; -- OK, legal escape
+ERROR: unsupported Unicode escape sequence
+LINE 1: SELECT '"\u0000"'::jsonpath;
+ ^
+DETAIL: \u0000 cannot be converted to text.
+SELECT '"\uaBcD"'::jsonpath; -- OK, uppercase and lower case both OK
+ jsonpath
+----------
+ "ꯍ"
+(1 row)
+
+-- handling of unicode surrogate pairs
+select '"\ud83d\ude04\ud83d\udc36"'::jsonpath as correct_in_utf8;
+ correct_in_utf8
+-----------------
+ "😄🐶"
+(1 row)
+
+select '"\ud83d\ud83d"'::jsonpath; -- 2 high surrogates in a row
+ERROR: invalid input syntax for type jsonpath
+LINE 1: select '"\ud83d\ud83d"'::jsonpath;
+ ^
+DETAIL: Unicode high surrogate must not follow a high surrogate.
+select '"\ude04\ud83d"'::jsonpath; -- surrogates in wrong order
+ERROR: invalid input syntax for type jsonpath
+LINE 1: select '"\ude04\ud83d"'::jsonpath;
+ ^
+DETAIL: Unicode low surrogate must follow a high surrogate.
+select '"\ud83dX"'::jsonpath; -- orphan high surrogate
+ERROR: invalid input syntax for type jsonpath
+LINE 1: select '"\ud83dX"'::jsonpath;
+ ^
+DETAIL: Unicode low surrogate must follow a high surrogate.
+select '"\ude04X"'::jsonpath; -- orphan low surrogate
+ERROR: invalid input syntax for type jsonpath
+LINE 1: select '"\ude04X"'::jsonpath;
+ ^
+DETAIL: Unicode low surrogate must follow a high surrogate.
+--handling of simple unicode escapes
+select '"the Copyright \u00a9 sign"'::jsonpath as correct_in_utf8;
+ correct_in_utf8
+------------------------
+ "the Copyright © sign"
+(1 row)
+
+select '"dollar \u0024 character"'::jsonpath as correct_everywhere;
+ correct_everywhere
+----------------------
+ "dollar $ character"
+(1 row)
+
+select '"dollar \\u0024 character"'::jsonpath as not_an_escape;
+ not_an_escape
+----------------------------
+ "dollar \\u0024 character"
+(1 row)
+
+select '"null \u0000 escape"'::jsonpath as not_unescaped;
+ERROR: unsupported Unicode escape sequence
+LINE 1: select '"null \u0000 escape"'::jsonpath as not_unescaped;
+ ^
+DETAIL: \u0000 cannot be converted to text.
+select '"null \\u0000 escape"'::jsonpath as not_an_escape;
+ not_an_escape
+-----------------------
+ "null \\u0000 escape"
+(1 row)
+
+-- checks for single-quoted values
+-- basic unicode input
+SELECT E'\'\u\''::jsonpath; -- ERROR, incomplete escape
+ERROR: invalid Unicode escape
+LINE 1: SELECT E'\'\u\''::jsonpath;
+ ^
+HINT: Unicode escapes must be \uXXXX or \UXXXXXXXX.
+SELECT E'\'\u00\''::jsonpath; -- ERROR, incomplete escape
+ERROR: invalid Unicode escape
+LINE 1: SELECT E'\'\u00\''::jsonpath;
+ ^
+HINT: Unicode escapes must be \uXXXX or \UXXXXXXXX.
+SELECT E'\'\u000g\''::jsonpath; -- ERROR, g is not a hex digit
+ERROR: invalid Unicode escape
+LINE 1: SELECT E'\'\u000g\''::jsonpath;
+ ^
+HINT: Unicode escapes must be \uXXXX or \UXXXXXXXX.
+SELECT E'\'\u0000\''::jsonpath; -- OK, legal escape
+ERROR: invalid Unicode escape value at or near "E'\'\u0000"
+LINE 1: SELECT E'\'\u0000\''::jsonpath;
+ ^
+SELECT E'\'\uaBcD\''::jsonpath; -- OK, uppercase and lower case both OK
+ jsonpath
+----------
+ "ꯍ"
+(1 row)
+
+-- handling of unicode surrogate pairs
+select E'\'\ud83d\ude04\ud83d\udc36\''::jsonpath as correct_in_utf8;
+ correct_in_utf8
+-----------------
+ "😄🐶"
+(1 row)
+
+select E'\'\ud83d\ud83d\''::jsonpath; -- 2 high surrogates in a row
+ERROR: invalid Unicode surrogate pair at or near "E'\'\ud83d\ud83d"
+LINE 1: select E'\'\ud83d\ud83d\''::jsonpath;
+ ^
+select E'\'\ude04\ud83d\''::jsonpath; -- surrogates in wrong order
+ERROR: invalid Unicode surrogate pair at or near "E'\'\ude04"
+LINE 1: select E'\'\ude04\ud83d\''::jsonpath;
+ ^
+select E'\'\ud83dX\''::jsonpath; -- orphan high surrogate
+ERROR: invalid Unicode surrogate pair at or near "E'\'\ud83dX"
+LINE 1: select E'\'\ud83dX\''::jsonpath;
+ ^
+select E'\'\ude04X\''::jsonpath; -- orphan low surrogate
+ERROR: invalid Unicode surrogate pair at or near "E'\'\ude04"
+LINE 1: select E'\'\ude04X\''::jsonpath;
+ ^
+--handling of simple unicode escapes
+select E'\'the Copyright \u00a9 sign\''::jsonpath as correct_in_utf8;
+ correct_in_utf8
+------------------------
+ "the Copyright © sign"
+(1 row)
+
+select E'\'dollar \u0024 character\''::jsonpath as correct_everywhere;
+ correct_everywhere
+----------------------
+ "dollar $ character"
+(1 row)
+
+select E'\'dollar \\u0024 character\''::jsonpath as not_an_escape;
+ not_an_escape
+----------------------
+ "dollar $ character"
+(1 row)
+
+select E'\'null \u0000 escape\''::jsonpath as not_unescaped;
+ERROR: invalid Unicode escape value at or near "E'\'null \u0000"
+LINE 1: select E'\'null \u0000 escape\''::jsonpath as not_unescaped;
+ ^
+select E'\'null \\u0000 escape\''::jsonpath as not_an_escape;
+ERROR: unsupported Unicode escape sequence
+LINE 1: select E'\'null \\u0000 escape\''::jsonpath as not_an_escape...
+ ^
+DETAIL: \u0000 cannot be converted to text.
+-- checks for quoted key names
+-- basic unicode input
+SELECT '$."\u"'::jsonpath; -- ERROR, incomplete escape
+ERROR: bad jsonpath representation
+LINE 1: SELECT '$."\u"'::jsonpath;
+ ^
+DETAIL: Unicode sequence is invalid at or near "\u"
+SELECT '$."\u00"'::jsonpath; -- ERROR, incomplete escape
+ERROR: bad jsonpath representation
+LINE 1: SELECT '$."\u00"'::jsonpath;
+ ^
+DETAIL: Unicode sequence is invalid at or near "\u00"
+SELECT '$."\u000g"'::jsonpath; -- ERROR, g is not a hex digit
+ERROR: bad jsonpath representation
+LINE 1: SELECT '$."\u000g"'::jsonpath;
+ ^
+DETAIL: Unicode sequence is invalid at or near "\u000"
+SELECT '$."\u0000"'::jsonpath; -- OK, legal escape
+ERROR: unsupported Unicode escape sequence
+LINE 1: SELECT '$."\u0000"'::jsonpath;
+ ^
+DETAIL: \u0000 cannot be converted to text.
+SELECT '$."\uaBcD"'::jsonpath; -- OK, uppercase and lower case both OK
+ jsonpath
+----------
+ $."ꯍ"
+(1 row)
+
+-- handling of unicode surrogate pairs
+select '$."\ud83d\ude04\ud83d\udc36"'::jsonpath as correct_in_utf8;
+ correct_in_utf8
+-----------------
+ $."😄🐶"
+(1 row)
+
+select '$."\ud83d\ud83d"'::jsonpath; -- 2 high surrogates in a row
+ERROR: invalid input syntax for type jsonpath
+LINE 1: select '$."\ud83d\ud83d"'::jsonpath;
+ ^
+DETAIL: Unicode high surrogate must not follow a high surrogate.
+select '$."\ude04\ud83d"'::jsonpath; -- surrogates in wrong order
+ERROR: invalid input syntax for type jsonpath
+LINE 1: select '$."\ude04\ud83d"'::jsonpath;
+ ^
+DETAIL: Unicode low surrogate must follow a high surrogate.
+select '$."\ud83dX"'::jsonpath; -- orphan high surrogate
+ERROR: invalid input syntax for type jsonpath
+LINE 1: select '$."\ud83dX"'::jsonpath;
+ ^
+DETAIL: Unicode low surrogate must follow a high surrogate.
+select '$."\ude04X"'::jsonpath; -- orphan low surrogate
+ERROR: invalid input syntax for type jsonpath
+LINE 1: select '$."\ude04X"'::jsonpath;
+ ^
+DETAIL: Unicode low surrogate must follow a high surrogate.
+--handling of simple unicode escapes
+select '$."the Copyright \u00a9 sign"'::jsonpath as correct_in_utf8;
+ correct_in_utf8
+--------------------------
+ $."the Copyright © sign"
+(1 row)
+
+select '$."dollar \u0024 character"'::jsonpath as correct_everywhere;
+ correct_everywhere
+------------------------
+ $."dollar $ character"
+(1 row)
+
+select '$."dollar \\u0024 character"'::jsonpath as not_an_escape;
+ not_an_escape
+------------------------------
+ $."dollar \\u0024 character"
+(1 row)
+
+select '$."null \u0000 escape"'::jsonpath as not_unescaped;
+ERROR: unsupported Unicode escape sequence
+LINE 1: select '$."null \u0000 escape"'::jsonpath as not_unescaped;
+ ^
+DETAIL: \u0000 cannot be converted to text.
+select '$."null \\u0000 escape"'::jsonpath as not_an_escape;
+ not_an_escape
+-------------------------
+ $."null \\u0000 escape"
+(1 row)
+
diff --git a/src/test/regress/expected/jsonpath_encoding_1.out b/src/test/regress/expected/jsonpath_encoding_1.out
new file mode 100644
index 00000000000..04179a8df79
--- /dev/null
+++ b/src/test/regress/expected/jsonpath_encoding_1.out
@@ -0,0 +1,237 @@
+-- encoding-sensitive tests for jsonpath
+-- checks for double-quoted values
+-- basic unicode input
+SELECT '"\u"'::jsonpath; -- ERROR, incomplete escape
+ERROR: bad jsonpath representation
+LINE 1: SELECT '"\u"'::jsonpath;
+ ^
+DETAIL: Unicode sequence is invalid at or near "\u"
+SELECT '"\u00"'::jsonpath; -- ERROR, incomplete escape
+ERROR: bad jsonpath representation
+LINE 1: SELECT '"\u00"'::jsonpath;
+ ^
+DETAIL: Unicode sequence is invalid at or near "\u00"
+SELECT '"\u000g"'::jsonpath; -- ERROR, g is not a hex digit
+ERROR: bad jsonpath representation
+LINE 1: SELECT '"\u000g"'::jsonpath;
+ ^
+DETAIL: Unicode sequence is invalid at or near "\u000"
+SELECT '"\u0000"'::jsonpath; -- OK, legal escape
+ERROR: unsupported Unicode escape sequence
+LINE 1: SELECT '"\u0000"'::jsonpath;
+ ^
+DETAIL: \u0000 cannot be converted to text.
+SELECT '"\uaBcD"'::jsonpath; -- OK, uppercase and lower case both OK
+ERROR: invalid input syntax for type jsonpath
+LINE 1: SELECT '"\uaBcD"'::jsonpath;
+ ^
+DETAIL: Unicode escape values cannot be used for code point values above 007F when the server encoding is not UTF8.
+-- handling of unicode surrogate pairs
+select '"\ud83d\ude04\ud83d\udc36"'::jsonpath as correct_in_utf8;
+ERROR: invalid input syntax for type jsonpath
+LINE 1: select '"\ud83d\ude04\ud83d\udc36"'::jsonpath as correct_in_...
+ ^
+DETAIL: Unicode escape values cannot be used for code point values above 007F when the server encoding is not UTF8.
+select '"\ud83d\ud83d"'::jsonpath; -- 2 high surrogates in a row
+ERROR: invalid input syntax for type jsonpath
+LINE 1: select '"\ud83d\ud83d"'::jsonpath;
+ ^
+DETAIL: Unicode high surrogate must not follow a high surrogate.
+select '"\ude04\ud83d"'::jsonpath; -- surrogates in wrong order
+ERROR: invalid input syntax for type jsonpath
+LINE 1: select '"\ude04\ud83d"'::jsonpath;
+ ^
+DETAIL: Unicode low surrogate must follow a high surrogate.
+select '"\ud83dX"'::jsonpath; -- orphan high surrogate
+ERROR: invalid input syntax for type jsonpath
+LINE 1: select '"\ud83dX"'::jsonpath;
+ ^
+DETAIL: Unicode low surrogate must follow a high surrogate.
+select '"\ude04X"'::jsonpath; -- orphan low surrogate
+ERROR: invalid input syntax for type jsonpath
+LINE 1: select '"\ude04X"'::jsonpath;
+ ^
+DETAIL: Unicode low surrogate must follow a high surrogate.
+--handling of simple unicode escapes
+select '"the Copyright \u00a9 sign"'::jsonpath as correct_in_utf8;
+ERROR: invalid input syntax for type jsonpath
+LINE 1: select '"the Copyright \u00a9 sign"'::jsonpath as correct_in...
+ ^
+DETAIL: Unicode escape values cannot be used for code point values above 007F when the server encoding is not UTF8.
+select '"dollar \u0024 character"'::jsonpath as correct_everywhere;
+ correct_everywhere
+----------------------
+ "dollar $ character"
+(1 row)
+
+select '"dollar \\u0024 character"'::jsonpath as not_an_escape;
+ not_an_escape
+----------------------------
+ "dollar \\u0024 character"
+(1 row)
+
+select '"null \u0000 escape"'::jsonpath as not_unescaped;
+ERROR: unsupported Unicode escape sequence
+LINE 1: select '"null \u0000 escape"'::jsonpath as not_unescaped;
+ ^
+DETAIL: \u0000 cannot be converted to text.
+select '"null \\u0000 escape"'::jsonpath as not_an_escape;
+ not_an_escape
+-----------------------
+ "null \\u0000 escape"
+(1 row)
+
+-- checks for single-quoted values
+-- basic unicode input
+SELECT E'\'\u\''::jsonpath; -- ERROR, incomplete escape
+ERROR: invalid Unicode escape
+LINE 1: SELECT E'\'\u\''::jsonpath;
+ ^
+HINT: Unicode escapes must be \uXXXX or \UXXXXXXXX.
+SELECT E'\'\u00\''::jsonpath; -- ERROR, incomplete escape
+ERROR: invalid Unicode escape
+LINE 1: SELECT E'\'\u00\''::jsonpath;
+ ^
+HINT: Unicode escapes must be \uXXXX or \UXXXXXXXX.
+SELECT E'\'\u000g\''::jsonpath; -- ERROR, g is not a hex digit
+ERROR: invalid Unicode escape
+LINE 1: SELECT E'\'\u000g\''::jsonpath;
+ ^
+HINT: Unicode escapes must be \uXXXX or \UXXXXXXXX.
+SELECT E'\'\u0000\''::jsonpath; -- OK, legal escape
+ERROR: invalid Unicode escape value at or near "E'\'\u0000"
+LINE 1: SELECT E'\'\u0000\''::jsonpath;
+ ^
+SELECT E'\'\uaBcD\''::jsonpath; -- OK, uppercase and lower case both OK
+ERROR: Unicode escape values cannot be used for code point values above 007F when the server encoding is not UTF8 at or near "E'\'\uaBcD"
+LINE 1: SELECT E'\'\uaBcD\''::jsonpath;
+ ^
+-- handling of unicode surrogate pairs
+select E'\'\ud83d\ude04\ud83d\udc36\''::jsonpath as correct_in_utf8;
+ERROR: Unicode escape values cannot be used for code point values above 007F when the server encoding is not UTF8 at or near "E'\'\ud83d\ude04"
+LINE 1: select E'\'\ud83d\ude04\ud83d\udc36\''::jsonpath as correct_...
+ ^
+select E'\'\ud83d\ud83d\''::jsonpath; -- 2 high surrogates in a row
+ERROR: invalid Unicode surrogate pair at or near "E'\'\ud83d\ud83d"
+LINE 1: select E'\'\ud83d\ud83d\''::jsonpath;
+ ^
+select E'\'\ude04\ud83d\''::jsonpath; -- surrogates in wrong order
+ERROR: invalid Unicode surrogate pair at or near "E'\'\ude04"
+LINE 1: select E'\'\ude04\ud83d\''::jsonpath;
+ ^
+select E'\'\ud83dX\''::jsonpath; -- orphan high surrogate
+ERROR: invalid Unicode surrogate pair at or near "E'\'\ud83dX"
+LINE 1: select E'\'\ud83dX\''::jsonpath;
+ ^
+select E'\'\ude04X\''::jsonpath; -- orphan low surrogate
+ERROR: invalid Unicode surrogate pair at or near "E'\'\ude04"
+LINE 1: select E'\'\ude04X\''::jsonpath;
+ ^
+--handling of simple unicode escapes
+select E'\'the Copyright \u00a9 sign\''::jsonpath as correct_in_utf8;
+ERROR: Unicode escape values cannot be used for code point values above 007F when the server encoding is not UTF8 at or near "E'\'the Copyright \u00a9"
+LINE 1: select E'\'the Copyright \u00a9 sign\''::jsonpath as correct...
+ ^
+select E'\'dollar \u0024 character\''::jsonpath as correct_everywhere;
+ correct_everywhere
+----------------------
+ "dollar $ character"
+(1 row)
+
+select E'\'dollar \\u0024 character\''::jsonpath as not_an_escape;
+ not_an_escape
+----------------------
+ "dollar $ character"
+(1 row)
+
+select E'\'null \u0000 escape\''::jsonpath as not_unescaped;
+ERROR: invalid Unicode escape value at or near "E'\'null \u0000"
+LINE 1: select E'\'null \u0000 escape\''::jsonpath as not_unescaped;
+ ^
+select E'\'null \\u0000 escape\''::jsonpath as not_an_escape;
+ERROR: unsupported Unicode escape sequence
+LINE 1: select E'\'null \\u0000 escape\''::jsonpath as not_an_escape...
+ ^
+DETAIL: \u0000 cannot be converted to text.
+-- checks for quoted key names
+-- basic unicode input
+SELECT '$."\u"'::jsonpath; -- ERROR, incomplete escape
+ERROR: bad jsonpath representation
+LINE 1: SELECT '$."\u"'::jsonpath;
+ ^
+DETAIL: Unicode sequence is invalid at or near "\u"
+SELECT '$."\u00"'::jsonpath; -- ERROR, incomplete escape
+ERROR: bad jsonpath representation
+LINE 1: SELECT '$."\u00"'::jsonpath;
+ ^
+DETAIL: Unicode sequence is invalid at or near "\u00"
+SELECT '$."\u000g"'::jsonpath; -- ERROR, g is not a hex digit
+ERROR: bad jsonpath representation
+LINE 1: SELECT '$."\u000g"'::jsonpath;
+ ^
+DETAIL: Unicode sequence is invalid at or near "\u000"
+SELECT '$."\u0000"'::jsonpath; -- OK, legal escape
+ERROR: unsupported Unicode escape sequence
+LINE 1: SELECT '$."\u0000"'::jsonpath;
+ ^
+DETAIL: \u0000 cannot be converted to text.
+SELECT '$."\uaBcD"'::jsonpath; -- OK, uppercase and lower case both OK
+ERROR: invalid input syntax for type jsonpath
+LINE 1: SELECT '$."\uaBcD"'::jsonpath;
+ ^
+DETAIL: Unicode escape values cannot be used for code point values above 007F when the server encoding is not UTF8.
+-- handling of unicode surrogate pairs
+select '$."\ud83d\ude04\ud83d\udc36"'::jsonpath as correct_in_utf8;
+ERROR: invalid input syntax for type jsonpath
+LINE 1: select '$."\ud83d\ude04\ud83d\udc36"'::jsonpath as correct_i...
+ ^
+DETAIL: Unicode escape values cannot be used for code point values above 007F when the server encoding is not UTF8.
+select '$."\ud83d\ud83d"'::jsonpath; -- 2 high surrogates in a row
+ERROR: invalid input syntax for type jsonpath
+LINE 1: select '$."\ud83d\ud83d"'::jsonpath;
+ ^
+DETAIL: Unicode high surrogate must not follow a high surrogate.
+select '$."\ude04\ud83d"'::jsonpath; -- surrogates in wrong order
+ERROR: invalid input syntax for type jsonpath
+LINE 1: select '$."\ude04\ud83d"'::jsonpath;
+ ^
+DETAIL: Unicode low surrogate must follow a high surrogate.
+select '$."\ud83dX"'::jsonpath; -- orphan high surrogate
+ERROR: invalid input syntax for type jsonpath
+LINE 1: select '$."\ud83dX"'::jsonpath;
+ ^
+DETAIL: Unicode low surrogate must follow a high surrogate.
+select '$."\ude04X"'::jsonpath; -- orphan low surrogate
+ERROR: invalid input syntax for type jsonpath
+LINE 1: select '$."\ude04X"'::jsonpath;
+ ^
+DETAIL: Unicode low surrogate must follow a high surrogate.
+--handling of simple unicode escapes
+select '$."the Copyright \u00a9 sign"'::jsonpath as correct_in_utf8;
+ERROR: invalid input syntax for type jsonpath
+LINE 1: select '$."the Copyright \u00a9 sign"'::jsonpath as correct_...
+ ^
+DETAIL: Unicode escape values cannot be used for code point values above 007F when the server encoding is not UTF8.
+select '$."dollar \u0024 character"'::jsonpath as correct_everywhere;
+ correct_everywhere
+------------------------
+ $."dollar $ character"
+(1 row)
+
+select '$."dollar \\u0024 character"'::jsonpath as not_an_escape;
+ not_an_escape
+------------------------------
+ $."dollar \\u0024 character"
+(1 row)
+
+select '$."null \u0000 escape"'::jsonpath as not_unescaped;
+ERROR: unsupported Unicode escape sequence
+LINE 1: select '$."null \u0000 escape"'::jsonpath as not_unescaped;
+ ^
+DETAIL: \u0000 cannot be converted to text.
+select '$."null \\u0000 escape"'::jsonpath as not_an_escape;
+ not_an_escape
+-------------------------
+ $."null \\u0000 escape"
+(1 row)
+
diff --git a/src/test/regress/parallel_schedule b/src/test/regress/parallel_schedule
index de4989ff94d..908fbf650aa 100644
--- a/src/test/regress/parallel_schedule
+++ b/src/test/regress/parallel_schedule
@@ -109,7 +109,7 @@ test: select_views portals_p2 foreign_key cluster dependency guc bitmapops combo
# ----------
# Another group of parallel tests (JSON related)
# ----------
-test: json jsonb json_encoding jsonpath jsonb_jsonpath
+test: json jsonb json_encoding jsonpath jsonpath_encoding jsonb_jsonpath
# ----------
# Another group of parallel tests
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
index 175ee263b67..fa754d1c6b0 100644
--- a/src/test/regress/serial_schedule
+++ b/src/test/regress/serial_schedule
@@ -160,6 +160,7 @@ test: json
test: jsonb
test: json_encoding
test: jsonpath
+test: jsonpath_encoding
test: jsonb_jsonpath
test: indirect_toast
test: equivclass
diff --git a/src/test/regress/sql/jsonb_jsonpath.sql b/src/test/regress/sql/jsonb_jsonpath.sql
index 41b346b2d4d..28c861bb179 100644
--- a/src/test/regress/sql/jsonb_jsonpath.sql
+++ b/src/test/regress/sql/jsonb_jsonpath.sql
@@ -269,7 +269,7 @@ select jsonb_path_query('[null,1,true,"a",[],{}]', 'lax $.type()');
select jsonb_path_query('[null,1,true,"a",[],{}]', '$[*].type()');
select jsonb_path_query('null', 'null.type()');
select jsonb_path_query('null', 'true.type()');
-select jsonb_path_query('null', '123.type()');
+select jsonb_path_query('null', '(123).type()');
select jsonb_path_query('null', '"123".type()');
select jsonb_path_query('{"a": 2}', '($.a - 5).abs() + 10');
diff --git a/src/test/regress/sql/jsonpath.sql b/src/test/regress/sql/jsonpath.sql
index e5f3391a666..9171ddbc6cd 100644
--- a/src/test/regress/sql/jsonpath.sql
+++ b/src/test/regress/sql/jsonpath.sql
@@ -66,6 +66,8 @@ select '$[$[0] ? (last > 0)]'::jsonpath;
select 'null.type()'::jsonpath;
select '1.type()'::jsonpath;
+select '(1).type()'::jsonpath;
+select '1.2.type()'::jsonpath;
select '"aaa".type()'::jsonpath;
select 'true.type()'::jsonpath;
select '$.double().floor().ceiling().abs()'::jsonpath;
@@ -145,3 +147,31 @@ select '$ ? (@.a < +0.1e+1)'::jsonpath;
select '$ ? (@.a < 10.1e+1)'::jsonpath;
select '$ ? (@.a < -10.1e+1)'::jsonpath;
select '$ ? (@.a < +10.1e+1)'::jsonpath;
+
+select '0'::jsonpath;
+select '00'::jsonpath;
+select '0.0'::jsonpath;
+select '0.000'::jsonpath;
+select '0.000e1'::jsonpath;
+select '0.000e2'::jsonpath;
+select '0.000e3'::jsonpath;
+select '0.0010'::jsonpath;
+select '0.0010e-1'::jsonpath;
+select '0.0010e+1'::jsonpath;
+select '0.0010e+2'::jsonpath;
+select '1e'::jsonpath;
+select '1.e'::jsonpath;
+select '1.2e'::jsonpath;
+select '1.2.e'::jsonpath;
+select '(1.2).e'::jsonpath;
+select '1e3'::jsonpath;
+select '1.e3'::jsonpath;
+select '1.e3.e'::jsonpath;
+select '1.e3.e4'::jsonpath;
+select '1.2e3'::jsonpath;
+select '1.2.e3'::jsonpath;
+select '(1.2).e3'::jsonpath;
+select '1..e'::jsonpath;
+select '1..e3'::jsonpath;
+select '(1.).e'::jsonpath;
+select '(1.).e3'::jsonpath;
diff --git a/src/test/regress/sql/jsonpath_encoding.sql b/src/test/regress/sql/jsonpath_encoding.sql
new file mode 100644
index 00000000000..a3b5bc39a1c
--- /dev/null
+++ b/src/test/regress/sql/jsonpath_encoding.sql
@@ -0,0 +1,71 @@
+
+-- encoding-sensitive tests for jsonpath
+
+-- checks for double-quoted values
+
+-- basic unicode input
+SELECT '"\u"'::jsonpath; -- ERROR, incomplete escape
+SELECT '"\u00"'::jsonpath; -- ERROR, incomplete escape
+SELECT '"\u000g"'::jsonpath; -- ERROR, g is not a hex digit
+SELECT '"\u0000"'::jsonpath; -- OK, legal escape
+SELECT '"\uaBcD"'::jsonpath; -- OK, uppercase and lower case both OK
+
+-- handling of unicode surrogate pairs
+select '"\ud83d\ude04\ud83d\udc36"'::jsonpath as correct_in_utf8;
+select '"\ud83d\ud83d"'::jsonpath; -- 2 high surrogates in a row
+select '"\ude04\ud83d"'::jsonpath; -- surrogates in wrong order
+select '"\ud83dX"'::jsonpath; -- orphan high surrogate
+select '"\ude04X"'::jsonpath; -- orphan low surrogate
+
+--handling of simple unicode escapes
+select '"the Copyright \u00a9 sign"'::jsonpath as correct_in_utf8;
+select '"dollar \u0024 character"'::jsonpath as correct_everywhere;
+select '"dollar \\u0024 character"'::jsonpath as not_an_escape;
+select '"null \u0000 escape"'::jsonpath as not_unescaped;
+select '"null \\u0000 escape"'::jsonpath as not_an_escape;
+
+-- checks for single-quoted values
+
+-- basic unicode input
+SELECT E'\'\u\''::jsonpath; -- ERROR, incomplete escape
+SELECT E'\'\u00\''::jsonpath; -- ERROR, incomplete escape
+SELECT E'\'\u000g\''::jsonpath; -- ERROR, g is not a hex digit
+SELECT E'\'\u0000\''::jsonpath; -- OK, legal escape
+SELECT E'\'\uaBcD\''::jsonpath; -- OK, uppercase and lower case both OK
+
+-- handling of unicode surrogate pairs
+select E'\'\ud83d\ude04\ud83d\udc36\''::jsonpath as correct_in_utf8;
+select E'\'\ud83d\ud83d\''::jsonpath; -- 2 high surrogates in a row
+select E'\'\ude04\ud83d\''::jsonpath; -- surrogates in wrong order
+select E'\'\ud83dX\''::jsonpath; -- orphan high surrogate
+select E'\'\ude04X\''::jsonpath; -- orphan low surrogate
+
+--handling of simple unicode escapes
+select E'\'the Copyright \u00a9 sign\''::jsonpath as correct_in_utf8;
+select E'\'dollar \u0024 character\''::jsonpath as correct_everywhere;
+select E'\'dollar \\u0024 character\''::jsonpath as not_an_escape;
+select E'\'null \u0000 escape\''::jsonpath as not_unescaped;
+select E'\'null \\u0000 escape\''::jsonpath as not_an_escape;
+
+-- checks for quoted key names
+
+-- basic unicode input
+SELECT '$."\u"'::jsonpath; -- ERROR, incomplete escape
+SELECT '$."\u00"'::jsonpath; -- ERROR, incomplete escape
+SELECT '$."\u000g"'::jsonpath; -- ERROR, g is not a hex digit
+SELECT '$."\u0000"'::jsonpath; -- OK, legal escape
+SELECT '$."\uaBcD"'::jsonpath; -- OK, uppercase and lower case both OK
+
+-- handling of unicode surrogate pairs
+select '$."\ud83d\ude04\ud83d\udc36"'::jsonpath as correct_in_utf8;
+select '$."\ud83d\ud83d"'::jsonpath; -- 2 high surrogates in a row
+select '$."\ude04\ud83d"'::jsonpath; -- surrogates in wrong order
+select '$."\ud83dX"'::jsonpath; -- orphan high surrogate
+select '$."\ude04X"'::jsonpath; -- orphan low surrogate
+
+--handling of simple unicode escapes
+select '$."the Copyright \u00a9 sign"'::jsonpath as correct_in_utf8;
+select '$."dollar \u0024 character"'::jsonpath as correct_everywhere;
+select '$."dollar \\u0024 character"'::jsonpath as not_an_escape;
+select '$."null \u0000 escape"'::jsonpath as not_unescaped;
+select '$."null \\u0000 escape"'::jsonpath as not_an_escape;