Fix jsonpath timestamptz encoding

Author: Nikita Glukhov

src/backend/utils/adt/formatting.c

@@ -3748,8 +3748,8 @@ to_date(PG_FUNCTION_ARGS)
  * presence of date/time/zone components in the format string.
  */
 Datum
-to_datetime(text *date_txt, const char *fmt, int fmt_len, bool strict,
-			Oid *typid, int32 *typmod)
+to_datetime(text *date_txt, const char *fmt, int fmt_len, char *tzname,
+			bool strict, Oid *typid, int32 *typmod, int *tz)
 {
 	struct pg_tm tm;
 	fsec_t		fsec;
@@ -3758,6 +3758,7 @@ to_datetime(text *date_txt, const char *fmt, int fmt_len, bool strict,
 	do_to_timestamp(date_txt, fmt, fmt_len, strict, &tm, &fsec, &flags);
 
 	*typmod = -1; /* TODO implement FF1, ..., FF9 */
+	*tz = 0;
 
 	if (flags & DCH_DATED)
 	{
@@ -3766,20 +3767,27 @@ to_datetime(text *date_txt, const char *fmt, int fmt_len, bool strict,
 			if (flags & DCH_ZONED)
 			{
 				TimestampTz	result;
-				int			tz;
 
 				if (tm.tm_zone)
+					tzname = (char *) tm.tm_zone;
+
+				if (tzname)
 				{
-					int			dterr = DecodeTimezone((char *) tm.tm_zone, &tz);
+					int			dterr = DecodeTimezone(tzname, tz);
 
 					if (dterr)
-						DateTimeParseError(dterr, text_to_cstring(date_txt),
-										   "timestamptz");
+						DateTimeParseError(dterr, tzname, "timestamptz");
 				}
 				else
-					tz = DetermineTimeZoneOffset(&tm, session_timezone);
+				{
+					ereport(ERROR,
+							(errcode(ERRCODE_INVALID_DATETIME_FORMAT),
+							 errmsg("missing time-zone in timestamptz input string")));
 
-				if (tm2timestamp(&tm, fsec, &tz, &result) != 0)
+					*tz = DetermineTimeZoneOffset(&tm, session_timezone);
+				}
+
+				if (tm2timestamp(&tm, fsec, tz, &result) != 0)
 					ereport(ERROR,
 							(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
 							 errmsg("timestamptz out of range")));
@@ -3843,20 +3851,27 @@ to_datetime(text *date_txt, const char *fmt, int fmt_len, bool strict,
 		if (flags & DCH_ZONED)
 		{
 			TimeTzADT  *result = palloc(sizeof(TimeTzADT));
-			int			tz;
 
 			if (tm.tm_zone)
+				tzname = (char *) tm.tm_zone;
+
+			if (tzname)
 			{
-				int			dterr = DecodeTimezone((char *) tm.tm_zone, &tz);
+				int			dterr = DecodeTimezone(tzname, tz);
 
 				if (dterr)
-					DateTimeParseError(dterr, text_to_cstring(date_txt),
-									   "timetz");
+					DateTimeParseError(dterr, tzname, "timetz");
 			}
 			else
-				tz = DetermineTimeZoneOffset(&tm, session_timezone);
+			{
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_DATETIME_FORMAT),
+						 errmsg("missing time-zone in timestamptz input string")));
+
+				*tz = DetermineTimeZoneOffset(&tm, session_timezone);
+			}
 
-			if (tm2timetz(&tm, fsec, tz, result) != 0)
+			if (tm2timetz(&tm, fsec, *tz, result) != 0)
 				ereport(ERROR,
 						(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
 						 errmsg("timetz out of range")));

src/backend/utils/adt/json.c

@@ -1506,23 +1506,23 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
 			{
 				char		buf[MAXDATELEN + 1];
 
-				JsonEncodeDateTime(buf, val, DATEOID);
+				JsonEncodeDateTime(buf, val, DATEOID, NULL);
 				appendStringInfo(result, "\"%s\"", buf);
 			}
 			break;
 		case JSONTYPE_TIMESTAMP:
 			{
 				char		buf[MAXDATELEN + 1];
 
-				JsonEncodeDateTime(buf, val, TIMESTAMPOID);
+				JsonEncodeDateTime(buf, val, TIMESTAMPOID, NULL);
 				appendStringInfo(result, "\"%s\"", buf);
 			}
 			break;
 		case JSONTYPE_TIMESTAMPTZ:
 			{
 				char		buf[MAXDATELEN + 1];
 
-				JsonEncodeDateTime(buf, val, TIMESTAMPTZOID);
+				JsonEncodeDateTime(buf, val, TIMESTAMPTZOID, NULL);
 				appendStringInfo(result, "\"%s\"", buf);
 			}
 			break;
@@ -1553,7 +1553,7 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
  * optionally preallocated buffer 'buf'.
  */
 char *
-JsonEncodeDateTime(char *buf, Datum value, Oid typid)
+JsonEncodeDateTime(char *buf, Datum value, Oid typid, int *tzp)
 {
 	if (!buf)
 		buf = palloc(MAXDATELEN + 1);
@@ -1630,11 +1630,30 @@ JsonEncodeDateTime(char *buf, Datum value, Oid typid)
 				const char *tzn = NULL;
 
 				timestamp = DatumGetTimestampTz(value);
+
+				/*
+				 * If time-zone is specified, we apply a time-zone shift,
+				 * convert timestamptz to pg_tm as if it was without time-zone,
+				 * and then use specified time-zone for encoding timestamp
+				 * into a string.
+				 */
+				if (tzp)
+				{
+					tz = *tzp;
+					timestamp -= (TimestampTz) tz * USECS_PER_SEC;
+				}
+
 				/* Same as timestamptz_out(), but forcing DateStyle */
 				if (TIMESTAMP_NOT_FINITE(timestamp))
 					EncodeSpecialTimestamp(timestamp, buf);
-				else if (timestamp2tm(timestamp, &tz, &tm, &fsec, &tzn, NULL) == 0)
+				else if (timestamp2tm(timestamp, tzp ? NULL : &tz, &tm, &fsec,
+									  tzp ? NULL : &tzn, NULL) == 0)
+				{
+					if (tzp)
+						tm.tm_isdst = 1;	/* set time-zone presence flag */
+
 					EncodeDateTime(&tm, fsec, true, tz, tzn, USE_XSD_DATES, buf);
+				}
 				else
 					ereport(ERROR,
 							(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),

src/backend/utils/adt/jsonb.c

@@ -794,17 +794,17 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
 				break;
 			case JSONBTYPE_DATE:
 				jb.type = jbvString;
-				jb.val.string.val = JsonEncodeDateTime(NULL, val, DATEOID);
+				jb.val.string.val = JsonEncodeDateTime(NULL, val, DATEOID, NULL);
 				jb.val.string.len = strlen(jb.val.string.val);
 				break;
 			case JSONBTYPE_TIMESTAMP:
 				jb.type = jbvString;
-				jb.val.string.val = JsonEncodeDateTime(NULL, val, TIMESTAMPOID);
+				jb.val.string.val = JsonEncodeDateTime(NULL, val, TIMESTAMPOID, NULL);
 				jb.val.string.len = strlen(jb.val.string.val);
 				break;
 			case JSONBTYPE_TIMESTAMPTZ:
 				jb.type = jbvString;
-				jb.val.string.val = JsonEncodeDateTime(NULL, val, TIMESTAMPTZOID);
+				jb.val.string.val = JsonEncodeDateTime(NULL, val, TIMESTAMPTZOID, NULL);
 				jb.val.string.len = strlen(jb.val.string.val);
 				break;
 			case JSONBTYPE_JSONCAST:

src/backend/utils/adt/jsonb_util.c

@@ -1752,7 +1752,8 @@ convertJsonbScalar(StringInfo buffer, JEntry *jentry, JsonbValue *scalarVal)
 
 				JsonEncodeDateTime(buf,
 								   scalarVal->val.datetime.value,
-								   scalarVal->val.datetime.typid);
+								   scalarVal->val.datetime.typid,
+								   &scalarVal->val.datetime.tz);
 				len = strlen(buf);
 				appendToBuffer(buffer, buf, len);
 

src/backend/utils/adt/jsonpath.c

@@ -76,6 +76,7 @@ flattenJsonPathParseItem(StringInfo buf, JsonPathParseItem *item,
 		case jpiDiv:
 		case jpiMod:
 		case jpiStartsWith:
+		case jpiDatetime:
 			{
 				int32	left, right;
 
@@ -89,13 +90,16 @@ flattenJsonPathParseItem(StringInfo buf, JsonPathParseItem *item,
 				right = buf->len;
 				appendBinaryStringInfo(buf, (char*)&right /* fake value */, sizeof(right));
 
-				chld = flattenJsonPathParseItem(buf, item->value.args.left,
-												allowCurrent,
-												insideArraySubscript);
+				chld = !item->value.args.left ? 0 :
+					flattenJsonPathParseItem(buf, item->value.args.left,
+											 allowCurrent,
+											 insideArraySubscript);
 				*(int32*)(buf->data + left) = chld;
-				chld = flattenJsonPathParseItem(buf, item->value.args.right,
-												allowCurrent,
-												insideArraySubscript);
+
+				chld = !item->value.args.right ? 0 :
+					flattenJsonPathParseItem(buf, item->value.args.right,
+											 allowCurrent,
+											 insideArraySubscript);
 				*(int32*)(buf->data + right) = chld;
 			}
 			break;
@@ -122,15 +126,6 @@ flattenJsonPathParseItem(StringInfo buf, JsonPathParseItem *item,
 				*(int32 *)(buf->data + offs) = chld;
 			}
 			break;
-		case jpiDatetime:
-			if (!item->value.arg)
-			{
-				int32 arg = 0;
-
-				appendBinaryStringInfo(buf, (char *) &arg, sizeof(arg));
-				break;
-			}
-			/* fall through */
 		case jpiFilter:
 		case jpiIsUnknown:
 		case jpiNot:
@@ -541,10 +536,17 @@ printJsonPathItem(StringInfo buf, JsonPathItem *v, bool inKey, bool printBracket
 			break;
 		case jpiDatetime:
 			appendBinaryStringInfo(buf, ".datetime(", 10);
-			if (v->content.arg)
+			if (v->content.args.left)
 			{
-				jspGetArg(v, &elem);
+				jspGetLeftArg(v, &elem);
 				printJsonPathItem(buf, &elem, false, false);
+
+				if (v->content.args.right)
+				{
+					appendBinaryStringInfo(buf, ", ", 2);
+					jspGetRightArg(v, &elem);
+					printJsonPathItem(buf, &elem, false, false);
+				}
 			}
 			appendStringInfoChar(buf, ')');
 			break;
@@ -668,6 +670,7 @@ jspInitByBuffer(JsonPathItem *v, char *base, int32 pos)
 		case jpiLessOrEqual:
 		case jpiGreaterOrEqual:
 		case jpiStartsWith:
+		case jpiDatetime:
 			read_int32(v->content.args.left, base, pos);
 			read_int32(v->content.args.right, base, pos);
 			break;
@@ -683,7 +686,6 @@ jspInitByBuffer(JsonPathItem *v, char *base, int32 pos)
 		case jpiPlus:
 		case jpiMinus:
 		case jpiFilter:
-		case jpiDatetime:
 			read_int32(v->content.arg, base, pos);
 			break;
 		case jpiIndexArray:
@@ -709,8 +711,7 @@ jspGetArg(JsonPathItem *v, JsonPathItem *a)
 		v->type == jpiIsUnknown ||
 		v->type == jpiExists ||
 		v->type == jpiPlus ||
-		v->type == jpiMinus ||
-		v->type == jpiDatetime
+		v->type == jpiMinus
 	);
 
 	jspInitByBuffer(a, v->base, v->content.arg);
@@ -790,6 +791,7 @@ jspGetLeftArg(JsonPathItem *v, JsonPathItem *a)
 		v->type == jpiMul ||
 		v->type == jpiDiv ||
 		v->type == jpiMod ||
+		v->type == jpiDatetime ||
 		v->type == jpiStartsWith
 	);
 
@@ -813,6 +815,7 @@ jspGetRightArg(JsonPathItem *v, JsonPathItem *a)
 		v->type == jpiMul ||
 		v->type == jpiDiv ||
 		v->type == jpiMod ||
+		v->type == jpiDatetime ||
 		v->type == jpiStartsWith
 	);