diff options
Diffstat (limited to 'src/backend/utils/adt/json.c')
| -rw-r--r-- | src/backend/utils/adt/json.c | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c index 951b6554007..d0d7206ae93 100644 --- a/src/backend/utils/adt/json.c +++ b/src/backend/utils/adt/json.c @@ -32,6 +32,9 @@ #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 @@ -1436,20 +1439,18 @@ datum_to_json(Datum val, bool is_null, StringInfo result, date = DatumGetDateADT(val); - /* XSD doesn't support infinite values */ if (DATE_NOT_FINITE(date)) - ereport(ERROR, - (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), - errmsg("date out of range"), - errdetail("JSON does not support infinite date values."))); + { + /* we have to format infinity ourselves */ + appendStringInfoString(result,DT_INFINITY); + } 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: @@ -1461,20 +1462,20 @@ datum_to_json(Datum val, bool is_null, StringInfo result, timestamp = DatumGetTimestamp(val); - /* XSD doesn't support infinite values */ if (TIMESTAMP_NOT_FINITE(timestamp)) - ereport(ERROR, - (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), - errmsg("timestamp out of range"), - errdetail("JSON does not support infinite timestamp values."))); + { + /* we have to format infinity ourselves */ + appendStringInfoString(result,DT_INFINITY); + } 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: @@ -1488,20 +1489,20 @@ datum_to_json(Datum val, bool is_null, StringInfo result, timestamp = DatumGetTimestamp(val); - /* XSD doesn't support infinite values */ if (TIMESTAMP_NOT_FINITE(timestamp)) - ereport(ERROR, - (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), - errmsg("timestamp out of range"), - errdetail("JSON does not support infinite timestamp values."))); + { + /* we have to format infinity ourselves */ + appendStringInfoString(result,DT_INFINITY); + } 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: |