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

Commit bda76c1

Browse files
adunstanadunstan
committed
Render infinite date/timestamps as 'infinity' for json/jsonb
Commit ab14a73 raised an error in these cases and later the behaviour was copied to jsonb. This is what the XML code, which we then adopted, does, as the XSD types don't accept infinite values. However, json dates and timestamps are just strings as far as json is concerned, so there is no reason not to render these values as 'infinity'. The json portion of this is backpatched to 9.4 where the behaviour was introduced. The jsonb portion only affects the development branch. Per gripe on pgsql-general.
1 parent fd6a3f3 commit bda76c1

File tree

8 files changed

+164
-48
lines changed

8 files changed

+164
-48
lines changed

‎src/backend/utils/adt/json.c

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
#include "utils/typcache.h"
3333
#include "utils/syscache.h"
3434

35+
/* String to output for infinite dates and timestamps */
36+
#define DT_INFINITY "\"infinity\""
37+
3538
/*
3639
* The context of the parser is maintained by the recursive descent
3740
* mechanism, but is passed explicitly to the error reporting routine
@@ -1436,20 +1439,18 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
14361439

14371440
date = DatumGetDateADT(val);
14381441

1439-
/* XSD doesn't support infinite values */
14401442
if (DATE_NOT_FINITE(date))
1441-
ereport(ERROR,
1442-
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
1443-
errmsg("date out of range"),
1444-
errdetail("JSON does not support infinite date values.")));
1443+
{
1444+
/* we have to format infinity ourselves */
1445+
appendStringInfoString(result,DT_INFINITY);
1446+
}
14451447
else
14461448
{
14471449
j2date(date + POSTGRES_EPOCH_JDATE,
14481450
&(tm.tm_year), &(tm.tm_mon), &(tm.tm_mday));
14491451
EncodeDateOnly(&tm, USE_XSD_DATES, buf);
1452+
appendStringInfo(result, "\"%s\"", buf);
14501453
}
1451-
1452-
appendStringInfo(result, "\"%s\"", buf);
14531454
}
14541455
break;
14551456
case JSONTYPE_TIMESTAMP:
@@ -1461,20 +1462,20 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
14611462

14621463
timestamp = DatumGetTimestamp(val);
14631464

1464-
/* XSD doesn't support infinite values */
14651465
if (TIMESTAMP_NOT_FINITE(timestamp))
1466-
ereport(ERROR,
1467-
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
1468-
errmsg("timestamp out of range"),
1469-
errdetail("JSON does not support infinite timestamp values.")));
1466+
{
1467+
/* we have to format infinity ourselves */
1468+
appendStringInfoString(result,DT_INFINITY);
1469+
}
14701470
else if (timestamp2tm(timestamp, NULL, &tm, &fsec, NULL, NULL) == 0)
1471+
{
14711472
EncodeDateTime(&tm, fsec, false, 0, NULL, USE_XSD_DATES, buf);
1473+
appendStringInfo(result, "\"%s\"", buf);
1474+
}
14721475
else
14731476
ereport(ERROR,
14741477
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
14751478
errmsg("timestamp out of range")));
1476-
1477-
appendStringInfo(result, "\"%s\"", buf);
14781479
}
14791480
break;
14801481
case JSONTYPE_TIMESTAMPTZ:
@@ -1488,20 +1489,20 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
14881489

14891490
timestamp = DatumGetTimestamp(val);
14901491

1491-
/* XSD doesn't support infinite values */
14921492
if (TIMESTAMP_NOT_FINITE(timestamp))
1493-
ereport(ERROR,
1494-
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
1495-
errmsg("timestamp out of range"),
1496-
errdetail("JSON does not support infinite timestamp values.")));
1493+
{
1494+
/* we have to format infinity ourselves */
1495+
appendStringInfoString(result,DT_INFINITY);
1496+
}
14971497
else if (timestamp2tm(timestamp, &tz, &tm, &fsec, &tzn, NULL) == 0)
1498+
{
14981499
EncodeDateTime(&tm, fsec, true, tz, tzn, USE_XSD_DATES, buf);
1500+
appendStringInfo(result, "\"%s\"", buf);
1501+
}
14991502
else
15001503
ereport(ERROR,
15011504
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
15021505
errmsg("timestamp out of range")));
1503-
1504-
appendStringInfo(result, "\"%s\"", buf);
15051506
}
15061507
break;
15071508
case JSONTYPE_JSON:

‎src/backend/utils/adt/jsonb.c

Lines changed: 34 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@
2828
#include "utils/syscache.h"
2929
#include "utils/typcache.h"
3030

31+
/*
32+
* String to output for infinite dates and timestamps.
33+
* Note the we don't use embedded quotes, unlike for json, because
34+
* we store jsonb strings dequoted.
35+
*/
36+
37+
#define DT_INFINITY "infinity"
38+
3139
typedef struct JsonbInState
3240
{
3341
JsonbParseState *parseState;
@@ -714,23 +722,21 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
714722
char buf[MAXDATELEN + 1];
715723

716724
date = DatumGetDateADT(val);
725+
jb.type = jbvString;
717726

718-
/* XSD doesn't support infinite values */
719727
if (DATE_NOT_FINITE(date))
720-
ereport(ERROR,
721-
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
722-
errmsg("date out of range"),
723-
errdetail("JSON does not support infinite date values.")));
728+
{
729+
jb.val.string.len = strlen(DT_INFINITY);
730+
jb.val.string.val = pstrdup(DT_INFINITY);
731+
}
724732
else
725733
{
726734
j2date(date + POSTGRES_EPOCH_JDATE,
727735
&(tm.tm_year), &(tm.tm_mon), &(tm.tm_mday));
728736
EncodeDateOnly(&tm, USE_XSD_DATES, buf);
737+
jb.val.string.len = strlen(buf);
738+
jb.val.string.val = pstrdup(buf);
729739
}
730-
731-
jb.type = jbvString;
732-
jb.val.string.len = strlen(buf);
733-
jb.val.string.val = pstrdup(buf);
734740
}
735741
break;
736742
case JSONBTYPE_TIMESTAMP:
@@ -741,23 +747,24 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
741747
char buf[MAXDATELEN + 1];
742748

743749
timestamp = DatumGetTimestamp(val);
750+
jb.type = jbvString;
744751

745-
/* XSD doesn't support infinite values */
746752
if (TIMESTAMP_NOT_FINITE(timestamp))
747-
ereport(ERROR,
748-
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
749-
errmsg("timestamp out of range"),
750-
errdetail("JSON does not support infinite timestamp values.")));
753+
{
754+
jb.val.string.len = strlen(DT_INFINITY);
755+
jb.val.string.val = pstrdup(DT_INFINITY);
756+
}
751757
else if (timestamp2tm(timestamp, NULL, &tm, &fsec, NULL, NULL) == 0)
758+
{
759+
752760
EncodeDateTime(&tm, fsec, false, 0, NULL, USE_XSD_DATES, buf);
761+
jb.val.string.len = strlen(buf);
762+
jb.val.string.val = pstrdup(buf);
763+
}
753764
else
754765
ereport(ERROR,
755766
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
756767
errmsg("timestamp out of range")));
757-
758-
jb.type = jbvString;
759-
jb.val.string.len = strlen(buf);
760-
jb.val.string.val = pstrdup(buf);
761768
}
762769
break;
763770
case JSONBTYPE_TIMESTAMPTZ:
@@ -770,23 +777,23 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
770777
char buf[MAXDATELEN + 1];
771778

772779
timestamp = DatumGetTimestamp(val);
780+
jb.type = jbvString;
773781

774-
/* XSD doesn't support infinite values */
775782
if (TIMESTAMP_NOT_FINITE(timestamp))
776-
ereport(ERROR,
777-
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
778-
errmsg("timestamp out of range"),
779-
errdetail("JSON does not support infinite timestamp values.")));
783+
{
784+
jb.val.string.len = strlen(DT_INFINITY);
785+
jb.val.string.val = pstrdup(DT_INFINITY);
786+
}
780787
else if (timestamp2tm(timestamp, &tz, &tm, &fsec, &tzn, NULL) == 0)
788+
{
781789
EncodeDateTime(&tm, fsec, true, tz, tzn, USE_XSD_DATES, buf);
790+
jb.val.string.len = strlen(buf);
791+
jb.val.string.val = pstrdup(buf);
792+
}
782793
else
783794
ereport(ERROR,
784795
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
785796
errmsg("timestamp out of range")));
786-
787-
jb.type = jbvString;
788-
jb.val.string.len = strlen(buf);
789-
jb.val.string.val = pstrdup(buf);
790797
}
791798
break;
792799
case JSONBTYPE_JSONCAST:

‎src/test/regress/expected/json.out

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,30 @@ select to_json(timestamptz '2014-05-28 12:22:35.614298-04');
426426
(1 row)
427427

428428
COMMIT;
429+
select to_json(date '2014-05-28');
430+
to_json
431+
--------------
432+
"2014-05-28"
433+
(1 row)
434+
435+
select to_json(date 'Infinity');
436+
to_json
437+
------------
438+
"infinity"
439+
(1 row)
440+
441+
select to_json(timestamp 'Infinity');
442+
to_json
443+
------------
444+
"infinity"
445+
(1 row)
446+
447+
select to_json(timestamptz 'Infinity');
448+
to_json
449+
------------
450+
"infinity"
451+
(1 row)
452+
429453
--json_agg
430454
SELECT json_agg(q)
431455
FROM ( SELECT $$a$$ || x AS b, y AS c,

‎src/test/regress/expected/json_1.out

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,30 @@ select to_json(timestamptz '2014-05-28 12:22:35.614298-04');
426426
(1 row)
427427

428428
COMMIT;
429+
select to_json(date '2014-05-28');
430+
to_json
431+
--------------
432+
"2014-05-28"
433+
(1 row)
434+
435+
select to_json(date 'Infinity');
436+
to_json
437+
------------
438+
"infinity"
439+
(1 row)
440+
441+
select to_json(timestamp 'Infinity');
442+
to_json
443+
------------
444+
"infinity"
445+
(1 row)
446+
447+
select to_json(timestamptz 'Infinity');
448+
to_json
449+
------------
450+
"infinity"
451+
(1 row)
452+
429453
--json_agg
430454
SELECT json_agg(q)
431455
FROM ( SELECT $$a$$ || x AS b, y AS c,

‎src/test/regress/expected/jsonb.out

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,30 @@ select to_jsonb(timestamptz '2014-05-28 12:22:35.614298-04');
330330
(1 row)
331331

332332
COMMIT;
333+
select to_jsonb(date '2014-05-28');
334+
to_jsonb
335+
--------------
336+
"2014-05-28"
337+
(1 row)
338+
339+
select to_jsonb(date 'Infinity');
340+
to_jsonb
341+
------------
342+
"infinity"
343+
(1 row)
344+
345+
select to_jsonb(timestamp 'Infinity');
346+
to_jsonb
347+
------------
348+
"infinity"
349+
(1 row)
350+
351+
select to_jsonb(timestamptz 'Infinity');
352+
to_jsonb
353+
------------
354+
"infinity"
355+
(1 row)
356+
333357
--jsonb_agg
334358
CREATE TEMP TABLE rows AS
335359
SELECT x, 'txt' || x as y

‎src/test/regress/expected/jsonb_1.out

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,30 @@ select to_jsonb(timestamptz '2014-05-28 12:22:35.614298-04');
330330
(1 row)
331331

332332
COMMIT;
333+
select to_jsonb(date '2014-05-28');
334+
to_jsonb
335+
--------------
336+
"2014-05-28"
337+
(1 row)
338+
339+
select to_jsonb(date 'Infinity');
340+
to_jsonb
341+
------------
342+
"infinity"
343+
(1 row)
344+
345+
select to_jsonb(timestamp 'Infinity');
346+
to_jsonb
347+
------------
348+
"infinity"
349+
(1 row)
350+
351+
select to_jsonb(timestamptz 'Infinity');
352+
to_jsonb
353+
------------
354+
"infinity"
355+
(1 row)
356+
333357
--jsonb_agg
334358
CREATE TEMP TABLE rows AS
335359
SELECT x, 'txt' || x as y

‎src/test/regress/sql/json.sql

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,12 @@ SET LOCAL TIME ZONE -8;
111111
select to_json(timestamptz '2014-05-28 12:22:35.614298-04');
112112
COMMIT;
113113

114+
select to_json(date '2014-05-28');
115+
116+
select to_json(date 'Infinity');
117+
select to_json(timestamp 'Infinity');
118+
select to_json(timestamptz 'Infinity');
119+
114120
--json_agg
115121

116122
SELECT json_agg(q)

‎src/test/regress/sql/jsonb.sql

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@ SET LOCAL TIME ZONE -8;
7474
select to_jsonb(timestamptz '2014-05-28 12:22:35.614298-04');
7575
COMMIT;
7676

77+
select to_jsonb(date '2014-05-28');
78+
79+
select to_jsonb(date 'Infinity');
80+
select to_jsonb(timestamp 'Infinity');
81+
select to_jsonb(timestamptz 'Infinity');
82+
7783
--jsonb_agg
7884

7985
CREATE TEMP TABLE rows AS

0 commit comments

Comments
 (0)