Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit aeaf910

Browse files
author
Nikita Glukhov
committed
Fix jsonpath timestamptz encoding in json tests
1 parent a7332c0 commit aeaf910

File tree

2 files changed

+62
-0
lines changed

2 files changed

+62
-0
lines changed

src/test/regress/expected/json_sqljson.out

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,37 @@ SELECT JSON_VALUE(json 'null', '$a' PASSING point ' (1, 2 )' AS a RETURNING poin
555555
(1,2)
556556
(1 row)
557557

558+
-- Test timestamptz passing and output
559+
SELECT JSON_VALUE(json 'null', '$ts' PASSING timestamptz '2018-02-21 12:34:56 +10' AS ts);
560+
json_value
561+
------------------------------
562+
Tue Feb 20 18:34:56 2018 PST
563+
(1 row)
564+
565+
SELECT JSON_VALUE(json 'null', '$ts' PASSING timestamptz '2018-02-21 12:34:56 +10' AS ts RETURNING timestamptz);
566+
json_value
567+
------------------------------
568+
Tue Feb 20 18:34:56 2018 PST
569+
(1 row)
570+
571+
SELECT JSON_VALUE(json 'null', '$ts' PASSING timestamptz '2018-02-21 12:34:56 +10' AS ts RETURNING timestamp);
572+
json_value
573+
--------------------------
574+
Tue Feb 20 18:34:56 2018
575+
(1 row)
576+
577+
SELECT JSON_VALUE(json 'null', '$ts' PASSING timestamptz '2018-02-21 12:34:56 +10' AS ts RETURNING json);
578+
json_value
579+
-----------------------------
580+
"2018-02-21T02:34:56+00:00"
581+
(1 row)
582+
583+
SELECT JSON_VALUE(json 'null', '$ts' PASSING timestamptz '2018-02-21 12:34:56 +10' AS ts RETURNING jsonb);
584+
json_value
585+
-----------------------------
586+
"2018-02-21T02:34:56+00:00"
587+
(1 row)
588+
558589
-- JSON_QUERY
559590
SELECT
560591
JSON_QUERY(js FORMAT JSON, '$'),
@@ -918,6 +949,25 @@ SELECT JSON_QUERY(json '{"a": 1}', '$.a' RETURNING sqljson_int_not_null);
918949

919950
SELECT JSON_QUERY(json '{"a": 1}', '$.b' RETURNING sqljson_int_not_null);
920951
ERROR: domain sqljson_int_not_null does not allow null values
952+
-- Test timestamptz passing and output
953+
SELECT JSON_QUERY(json 'null', '$ts' PASSING timestamptz '2018-02-21 12:34:56 +10' AS ts);
954+
json_query
955+
-----------------------------
956+
"2018-02-21T02:34:56+00:00"
957+
(1 row)
958+
959+
SELECT JSON_QUERY(json 'null', '$ts' PASSING timestamptz '2018-02-21 12:34:56 +10' AS ts RETURNING json);
960+
json_query
961+
-----------------------------
962+
"2018-02-21T02:34:56+00:00"
963+
(1 row)
964+
965+
SELECT JSON_QUERY(json 'null', '$ts' PASSING timestamptz '2018-02-21 12:34:56 +10' AS ts RETURNING jsonb);
966+
json_query
967+
-----------------------------
968+
"2018-02-21T02:34:56+00:00"
969+
(1 row)
970+
921971
-- Test constraints
922972
CREATE TABLE test_json_constraints (
923973
js text,

src/test/regress/sql/json_sqljson.sql

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,13 @@ FROM
139139
SELECT JSON_VALUE(json 'null', '$a' PASSING point ' (1, 2 )' AS a);
140140
SELECT JSON_VALUE(json 'null', '$a' PASSING point ' (1, 2 )' AS a RETURNING point);
141141

142+
-- Test timestamptz passing and output
143+
SELECT JSON_VALUE(json 'null', '$ts' PASSING timestamptz '2018-02-21 12:34:56 +10' AS ts);
144+
SELECT JSON_VALUE(json 'null', '$ts' PASSING timestamptz '2018-02-21 12:34:56 +10' AS ts RETURNING timestamptz);
145+
SELECT JSON_VALUE(json 'null', '$ts' PASSING timestamptz '2018-02-21 12:34:56 +10' AS ts RETURNING timestamp);
146+
SELECT JSON_VALUE(json 'null', '$ts' PASSING timestamptz '2018-02-21 12:34:56 +10' AS ts RETURNING json);
147+
SELECT JSON_VALUE(json 'null', '$ts' PASSING timestamptz '2018-02-21 12:34:56 +10' AS ts RETURNING jsonb);
148+
142149
-- JSON_QUERY
143150

144151
SELECT
@@ -254,6 +261,11 @@ SELECT * FROM unnest(JSON_QUERY(json '[{"a": 1, "t": ["foo", []]}, {"a": 2, "jb"
254261
SELECT JSON_QUERY(json '{"a": 1}', '$.a' RETURNING sqljson_int_not_null);
255262
SELECT JSON_QUERY(json '{"a": 1}', '$.b' RETURNING sqljson_int_not_null);
256263

264+
-- Test timestamptz passing and output
265+
SELECT JSON_QUERY(json 'null', '$ts' PASSING timestamptz '2018-02-21 12:34:56 +10' AS ts);
266+
SELECT JSON_QUERY(json 'null', '$ts' PASSING timestamptz '2018-02-21 12:34:56 +10' AS ts RETURNING json);
267+
SELECT JSON_QUERY(json 'null', '$ts' PASSING timestamptz '2018-02-21 12:34:56 +10' AS ts RETURNING jsonb);
268+
257269
-- Test constraints
258270

259271
CREATE TABLE test_json_constraints (

0 commit comments

Comments
 (0)