diff options
Diffstat (limited to 'src/backend/utils/adt/json.c')
| -rw-r--r-- | src/backend/utils/adt/json.c | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c index 679315b6587..c3df54c018c 100644 --- a/src/backend/utils/adt/json.c +++ b/src/backend/utils/adt/json.c @@ -33,9 +33,6 @@ #include "utils/typcache.h" #include "utils/syscache.h" -/* String to output for infinite dates and timestamps */ -#define DT_INFINITY "\"infinity\"" - /* * The context of the parser is maintained by the recursive descent * mechanism, but is passed explicitly to the error reporting routine @@ -1435,19 +1432,16 @@ datum_to_json(Datum val, bool is_null, StringInfo result, char buf[MAXDATELEN + 1]; date = DatumGetDateADT(val); - + /* Same as date_out(), but forcing DateStyle */ if (DATE_NOT_FINITE(date)) - { - /* we have to format infinity ourselves */ - appendStringInfoString(result,DT_INFINITY); - } + EncodeSpecialDate(date, buf); else { j2date(date + POSTGRES_EPOCH_JDATE, &(tm.tm_year), &(tm.tm_mon), &(tm.tm_mday)); EncodeDateOnly(&tm, USE_XSD_DATES, buf); - appendStringInfo(result, "\"%s\"", buf); } + appendStringInfo(result, "\"%s\"", buf); } break; case JSONTYPE_TIMESTAMP: @@ -1458,21 +1452,16 @@ datum_to_json(Datum val, bool is_null, StringInfo result, char buf[MAXDATELEN + 1]; timestamp = DatumGetTimestamp(val); - + /* Same as timestamp_out(), but forcing DateStyle */ if (TIMESTAMP_NOT_FINITE(timestamp)) - { - /* we have to format infinity ourselves */ - appendStringInfoString(result,DT_INFINITY); - } + EncodeSpecialTimestamp(timestamp, buf); else if (timestamp2tm(timestamp, NULL, &tm, &fsec, NULL, NULL) == 0) - { EncodeDateTime(&tm, fsec, false, 0, NULL, USE_XSD_DATES, buf); - appendStringInfo(result, "\"%s\"", buf); - } else ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); + appendStringInfo(result, "\"%s\"", buf); } break; case JSONTYPE_TIMESTAMPTZ: @@ -1484,22 +1473,17 @@ datum_to_json(Datum val, bool is_null, StringInfo result, const char *tzn = NULL; char buf[MAXDATELEN + 1]; - timestamp = DatumGetTimestamp(val); - + timestamp = DatumGetTimestampTz(val); + /* Same as timestamptz_out(), but forcing DateStyle */ if (TIMESTAMP_NOT_FINITE(timestamp)) - { - /* we have to format infinity ourselves */ - appendStringInfoString(result,DT_INFINITY); - } + EncodeSpecialTimestamp(timestamp, buf); else if (timestamp2tm(timestamp, &tz, &tm, &fsec, &tzn, NULL) == 0) - { EncodeDateTime(&tm, fsec, true, tz, tzn, USE_XSD_DATES, buf); - appendStringInfo(result, "\"%s\"", buf); - } else ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), errmsg("timestamp out of range"))); + appendStringInfo(result, "\"%s\"", buf); } break; case JSONTYPE_JSON: |