Add jbvDatetime JsonbValue type

Author: Nikita Glukhov

src/backend/utils/adt/jsonb_util.c

@@ -15,6 +15,7 @@
 
 #include "access/hash.h"
 #include "catalog/pg_collation.h"
+#include "catalog/pg_type.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
 #include "utils/jsonb.h"
@@ -241,6 +242,7 @@ compareJsonbContainers(JsonbContainer *a, JsonbContainer *b)
 							res = (va.val.object.nPairs > vb.val.object.nPairs) ? 1 : -1;
 						break;
 					case jbvBinary:
+					case jbvDatetime:
 						elog(ERROR, "unexpected jbvBinary value");
 				}
 			}
@@ -1741,6 +1743,44 @@ convertJsonbScalar(StringInfo buffer, JEntry *jentry, JsonbValue *scalarVal)
 				JENTRY_ISBOOL_TRUE : JENTRY_ISBOOL_FALSE;
 			break;
 
+		case jbvDatetime:
+			{
+				char	   *str;
+				PGFunction	typoutput;
+				int			len;
+
+				switch (scalarVal->val.datetime.typid)
+				{
+					case DATEOID:
+						typoutput = date_out;
+						break;
+					case TIMEOID:
+						typoutput = time_out;
+						break;
+					case TIMETZOID:
+						typoutput = timetz_out;
+						break;
+					case TIMESTAMPOID:
+						typoutput = timestamp_out;
+						break;
+					case TIMESTAMPTZOID:
+						typoutput = timestamptz_out;
+						break;
+					default:
+						elog(ERROR, "unknown jsonb value datetime type oid %d",
+							 scalarVal->val.datetime.typid);
+				}
+
+				str = DatumGetCString(DirectFunctionCall1(typoutput,
+												scalarVal->val.datetime.value));
+
+				len = strlen(str);
+
+				appendToBuffer(buffer, str, len);
+				*jentry = JENTRY_ISSTRING | len;
+			}
+			break;
+
 		default:
 			elog(ERROR, "invalid jsonb scalar type");
 	}

src/include/utils/jsonb.h

@@ -238,7 +238,9 @@ enum jbvType
 	jbvArray = 0x10,
 	jbvObject,
 	/* Binary (i.e. struct Jsonb) jbvArray/jbvObject */
-	jbvBinary
+	jbvBinary,
+	/* Virtual types */
+	jbvDatetime = 0x20,
 };
 
 /*
@@ -279,11 +281,19 @@ struct JsonbValue
 			int			len;
 			JsonbContainer *data;
 		}			binary;		/* Array or object, in on-disk format */
+
+		struct
+		{
+			Datum		value;
+			Oid			typid;
+			int32		typmod;
+		}			datetime;
 	}			val;
 };
 
-#define IsAJsonbScalar(jsonbval)	((jsonbval)->type >= jbvNull && \
-									 (jsonbval)->type <= jbvBool)
+#define IsAJsonbScalar(jsonbval)	(((jsonbval)->type >= jbvNull && \
+									  (jsonbval)->type <= jbvBool) || \
+									  (jsonbval)->type == jbvDatetime)
 
 /*
  * Key/value pair within an Object.