]> granicus.if.org Git - postgresql/blobdiff - src/backend/utils/adt/json.c
Fix initialization of fake LSN for unlogged relations
[postgresql] / src / backend / utils / adt / json.c
index 16f4eccc06ec2228a60d6c5440caacca2cc87362..d4ba3bd87db344305738250db64733f13593ce22 100644 (file)
@@ -3,7 +3,7 @@
  * json.c
  *             JSON data type support.
  *
- * Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2019, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
 
 #include "access/htup_details.h"
 #include "access/transam.h"
-#include "catalog/pg_cast.h"
 #include "catalog/pg_type.h"
 #include "executor/spi.h"
+#include "funcapi.h"
 #include "lib/stringinfo.h"
 #include "libpq/pqformat.h"
 #include "mb/pg_wchar.h"
+#include "miscadmin.h"
 #include "parser/parse_coerce.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
+#include "utils/date.h"
+#include "utils/datetime.h"
 #include "utils/lsyscache.h"
 #include "utils/json.h"
 #include "utils/jsonapi.h"
@@ -48,30 +51,60 @@ typedef enum                                        /* contexts of JSON parser */
        JSON_PARSE_END                          /* saw the end of a document, expect nothing */
 } JsonParseContext;
 
+typedef enum                                   /* type categories for datum_to_json */
+{
+       JSONTYPE_NULL,                          /* null, so we didn't bother to identify */
+       JSONTYPE_BOOL,                          /* boolean (built-in types only) */
+       JSONTYPE_NUMERIC,                       /* numeric (ditto) */
+       JSONTYPE_DATE,                          /* we use special formatting for datetimes */
+       JSONTYPE_TIMESTAMP,
+       JSONTYPE_TIMESTAMPTZ,
+       JSONTYPE_JSON,                          /* JSON itself (and JSONB) */
+       JSONTYPE_ARRAY,                         /* array */
+       JSONTYPE_COMPOSITE,                     /* composite */
+       JSONTYPE_CAST,                          /* something with an explicit cast to JSON */
+       JSONTYPE_OTHER                          /* all else */
+} JsonTypeCategory;
+
+typedef struct JsonAggState
+{
+       StringInfo      str;
+       JsonTypeCategory key_category;
+       Oid                     key_output_func;
+       JsonTypeCategory val_category;
+       Oid                     val_output_func;
+} JsonAggState;
+
 static inline void json_lex(JsonLexContext *lex);
 static inline void json_lex_string(JsonLexContext *lex);
-static inline void json_lex_number(JsonLexContext *lex, char *s, bool *num_err);
+static inline void json_lex_number(JsonLexContext *lex, char *s,
+                                                                  bool *num_err, int *total_len);
 static inline void parse_scalar(JsonLexContext *lex, JsonSemAction *sem);
 static void parse_object_field(JsonLexContext *lex, JsonSemAction *sem);
 static void parse_object(JsonLexContext *lex, JsonSemAction *sem);
 static void parse_array_element(JsonLexContext *lex, JsonSemAction *sem);
 static void parse_array(JsonLexContext *lex, JsonSemAction *sem);
-static void report_parse_error(JsonParseContext ctx, JsonLexContext *lex);
-static void report_invalid_token(JsonLexContext *lex);
+static void report_parse_error(JsonParseContext ctx, JsonLexContext *lex) pg_attribute_noreturn();
+static void report_invalid_token(JsonLexContext *lex) pg_attribute_noreturn();
 static int     report_json_context(JsonLexContext *lex);
 static char *extract_mb_char(char *s);
 static void composite_to_json(Datum composite, StringInfo result,
-                                 bool use_line_feeds);
+                                                         bool use_line_feeds);
 static void array_dim_to_json(StringInfo result, int dim, int ndims, int *dims,
-                                 Datum *vals, bool *nulls, int *valcount,
-                                 TYPCATEGORY tcategory, Oid typoutputfunc,
-                                 bool use_line_feeds);
+                                                         Datum *vals, bool *nulls, int *valcount,
+                                                         JsonTypeCategory tcategory, Oid outfuncoid,
+                                                         bool use_line_feeds);
 static void array_to_json_internal(Datum array, StringInfo result,
-                                          bool use_line_feeds);
+                                                                  bool use_line_feeds);
+static void json_categorize_type(Oid typoid,
+                                                                JsonTypeCategory *tcategory,
+                                                                Oid *outfuncoid);
 static void datum_to_json(Datum val, bool is_null, StringInfo result,
-                         TYPCATEGORY tcategory, Oid typoutputfunc, bool key_scalar);
+                                                 JsonTypeCategory tcategory, Oid outfuncoid,
+                                                 bool key_scalar);
 static void add_json(Datum val, bool is_null, StringInfo result,
-                Oid val_type, bool key_scalar);
+                                        Oid val_type, bool key_scalar);
+static text *catenate_stringinfo_string(StringInfo buffer, const char *addon);
 
 /* the null action object used for pure validation */
 static JsonSemAction nullSemAction =
@@ -140,17 +173,9 @@ static inline void
 lex_expect(JsonParseContext ctx, JsonLexContext *lex, JsonTokenType token)
 {
        if (!lex_accept(lex, token, NULL))
-               report_parse_error(ctx, lex);;
+               report_parse_error(ctx, lex);
 }
 
-/*
- * All the defined     type categories are upper case , so use lower case here
- * so we avoid any possible clash.
- */
-/* fake type category for JSON so we can distinguish it in datum_to_json */
-#define TYPCATEGORY_JSON 'j'
-/* fake category for types that have a cast to json */
-#define TYPCATEGORY_JSON_CAST 'c'
 /* chars to consider as part of an alphanumeric token */
 #define JSON_ALPHANUMERIC_CHAR(c)  \
        (((c) >= 'a' && (c) <= 'z') || \
@@ -159,6 +184,43 @@ lex_expect(JsonParseContext ctx, JsonLexContext *lex, JsonTokenType token)
         (c) == '_' || \
         IS_HIGHBIT_SET(c))
 
+/*
+ * Utility function to check if a string is a valid JSON number.
+ *
+ * str is of length len, and need not be null-terminated.
+ */
+bool
+IsValidJsonNumber(const char *str, int len)
+{
+       bool            numeric_error;
+       int                     total_len;
+       JsonLexContext dummy_lex;
+
+       if (len <= 0)
+               return false;
+
+       /*
+        * json_lex_number expects a leading  '-' to have been eaten already.
+        *
+        * having to cast away the constness of str is ugly, but there's not much
+        * easy alternative.
+        */
+       if (*str == '-')
+       {
+               dummy_lex.input = unconstify(char *, str) +1;
+               dummy_lex.input_length = len - 1;
+       }
+       else
+       {
+               dummy_lex.input = unconstify(char *, str);
+               dummy_lex.input_length = len;
+       }
+
+       json_lex_number(&dummy_lex, dummy_lex.input, &numeric_error, &total_len);
+
+       return (!numeric_error) && (total_len == dummy_lex.input_length);
+}
+
 /*
  * Input.
  */
@@ -238,8 +300,8 @@ json_recv(PG_FUNCTION_ARGS)
 JsonLexContext *
 makeJsonLexContext(text *json, bool need_escapes)
 {
-       return makeJsonLexContextCstringLen(VARDATA(json),
-                                                                               VARSIZE(json) - VARHDRSZ,
+       return makeJsonLexContextCstringLen(VARDATA_ANY(json),
+                                                                               VARSIZE_ANY_EXHDR(json),
                                                                                need_escapes);
 }
 
@@ -262,7 +324,7 @@ makeJsonLexContextCstringLen(char *json, int len, bool need_escapes)
  * Publicly visible entry point for the JSON parser.
  *
  * lex is a lexing context, set up for the json to be processed by calling
- * makeJsonLexContext(). sem is a strucure of function pointers to semantic
+ * makeJsonLexContext(). sem is a structure of function pointers to semantic
  * action routines to be called at appropriate spots during parsing, and a
  * pointer to a state object to be passed to those routines.
  */
@@ -286,13 +348,52 @@ pg_parse_json(JsonLexContext *lex, JsonSemAction *sem)
                        parse_array(lex, sem);
                        break;
                default:
-                       parse_scalar(lex, sem);         /* json can be a bare scalar */
+                       parse_scalar(lex, sem); /* json can be a bare scalar */
        }
 
        lex_expect(JSON_PARSE_END, lex, JSON_TOKEN_END);
 
 }
 
+/*
+ * json_count_array_elements
+ *
+ * Returns number of array elements in lex context at start of array token
+ * until end of array token at same nesting level.
+ *
+ * Designed to be called from array_start routines.
+ */
+int
+json_count_array_elements(JsonLexContext *lex)
+{
+       JsonLexContext copylex;
+       int                     count;
+
+       /*
+        * It's safe to do this with a shallow copy because the lexical routines
+        * don't scribble on the input. They do scribble on the other pointers
+        * etc, so doing this with a copy makes that safe.
+        */
+       memcpy(&copylex, lex, sizeof(JsonLexContext));
+       copylex.strval = NULL;          /* not interested in values here */
+       copylex.lex_level++;
+
+       count = 0;
+       lex_expect(JSON_PARSE_ARRAY_START, &copylex, JSON_TOKEN_ARRAY_START);
+       if (lex_peek(&copylex) != JSON_TOKEN_ARRAY_END)
+       {
+               do
+               {
+                       count++;
+                       parse_array_element(&copylex, &nullSemAction);
+               }
+               while (lex_accept(&copylex, JSON_TOKEN_COMMA, NULL));
+       }
+       lex_expect(JSON_PARSE_ARRAY_NEXT, &copylex, JSON_TOKEN_ARRAY_END);
+
+       return count;
+}
+
 /*
  *     Recursive Descent parse routines. There is one for each structural
  *     element in a json document:
@@ -342,8 +443,9 @@ static void
 parse_object_field(JsonLexContext *lex, JsonSemAction *sem)
 {
        /*
-        * an object field is "fieldname" : value where value can be a scalar,
-        * object or array
+        * An object field is "fieldname" : value where value can be a scalar,
+        * object or array.  Note: in user-facing docs and error messages, we
+        * generally call a field name a "key".
         */
 
        char       *fname = NULL;       /* keep compiler quiet */
@@ -381,9 +483,6 @@ parse_object_field(JsonLexContext *lex, JsonSemAction *sem)
 
        if (oend != NULL)
                (*oend) (sem->semstate, fname, isnull);
-
-       if (fname != NULL)
-               pfree(fname);
 }
 
 static void
@@ -391,12 +490,14 @@ parse_object(JsonLexContext *lex, JsonSemAction *sem)
 {
        /*
         * an object is a possibly empty sequence of object fields, separated by
-        * commas and surrounde by curly braces.
+        * commas and surrounded by curly braces.
         */
        json_struct_action ostart = sem->object_start;
        json_struct_action oend = sem->object_end;
        JsonTokenType tok;
 
+       check_stack_depth();
+
        if (ostart != NULL)
                (*ostart) (sem->semstate);
 
@@ -408,7 +509,7 @@ parse_object(JsonLexContext *lex, JsonSemAction *sem)
         */
        lex->lex_level++;
 
-       /* we know this will succeeed, just clearing the token */
+       /* we know this will succeed, just clearing the token */
        lex_expect(JSON_PARSE_OBJECT_START, lex, JSON_TOKEN_OBJECT_START);
 
        tok = lex_peek(lex);
@@ -475,6 +576,8 @@ parse_array(JsonLexContext *lex, JsonSemAction *sem)
        json_struct_action astart = sem->array_start;
        json_struct_action aend = sem->array_end;
 
+       check_stack_depth();
+
        if (astart != NULL)
                (*astart) (sem->semstate);
 
@@ -575,7 +678,7 @@ json_lex(JsonLexContext *lex)
                                break;
                        case '-':
                                /* Negative number. */
-                               json_lex_number(lex, s + 1, NULL);
+                               json_lex_number(lex, s + 1, NULL, NULL);
                                lex->token_type = JSON_TOKEN_NUMBER;
                                break;
                        case '0':
@@ -589,7 +692,7 @@ json_lex(JsonLexContext *lex)
                        case '8':
                        case '9':
                                /* Positive number. */
-                               json_lex_number(lex, s, NULL);
+                               json_lex_number(lex, s, NULL, NULL);
                                lex->token_type = JSON_TOKEN_NUMBER;
                                break;
                        default:
@@ -680,7 +783,7 @@ json_lex_string(JsonLexContext *lex)
                        lex->token_terminator = s;
                        ereport(ERROR,
                                        (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                        errmsg("invalid input syntax for type json"),
+                                        errmsg("invalid input syntax for type %s", "json"),
                                         errdetail("Character with value 0x%02x must be escaped.",
                                                           (unsigned char) *s),
                                         report_json_context(lex)));
@@ -720,7 +823,8 @@ json_lex_string(JsonLexContext *lex)
                                                lex->token_terminator = s + pg_mblen(s);
                                                ereport(ERROR,
                                                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                                                errmsg("invalid input syntax for type json"),
+                                                                errmsg("invalid input syntax for type %s",
+                                                                               "json"),
                                                                 errdetail("\"\\u\" must be followed by four hexadecimal digits."),
                                                                 report_json_context(lex)));
                                        }
@@ -734,10 +838,11 @@ json_lex_string(JsonLexContext *lex)
                                        {
                                                if (hi_surrogate != -1)
                                                        ereport(ERROR,
-                                                          (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                                               errmsg("invalid input syntax for type json"),
-                                                               errdetail("Unicode high surrogate must not follow a high surrogate."),
-                                                               report_json_context(lex)));
+                                                                       (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+                                                                        errmsg("invalid input syntax for type %s",
+                                                                                       "json"),
+                                                                        errdetail("Unicode high surrogate must not follow a high surrogate."),
+                                                                        report_json_context(lex)));
                                                hi_surrogate = (ch & 0x3ff) << 10;
                                                continue;
                                        }
@@ -745,10 +850,10 @@ json_lex_string(JsonLexContext *lex)
                                        {
                                                if (hi_surrogate == -1)
                                                        ereport(ERROR,
-                                                          (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                                               errmsg("invalid input syntax for type json"),
-                                                               errdetail("Unicode low surrogate must follow a high surrogate."),
-                                                               report_json_context(lex)));
+                                                                       (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+                                                                        errmsg("invalid input syntax for type %s", "json"),
+                                                                        errdetail("Unicode low surrogate must follow a high surrogate."),
+                                                                        report_json_context(lex)));
                                                ch = 0x10000 + hi_surrogate + (ch & 0x3ff);
                                                hi_surrogate = -1;
                                        }
@@ -756,7 +861,7 @@ json_lex_string(JsonLexContext *lex)
                                        if (hi_surrogate != -1)
                                                ereport(ERROR,
                                                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                                                errmsg("invalid input syntax for type json"),
+                                                                errmsg("invalid input syntax for type %s", "json"),
                                                                 errdetail("Unicode low surrogate must follow a high surrogate."),
                                                                 report_json_context(lex)));
 
@@ -764,14 +869,17 @@ json_lex_string(JsonLexContext *lex)
                                         * For UTF8, replace the escape sequence by the actual
                                         * utf8 character in lex->strval. Do this also for other
                                         * encodings if the escape designates an ASCII character,
-                                        * otherwise raise an error. We don't ever unescape a
-                                        * \u0000, since that would result in an impermissible nul
-                                        * byte.
+                                        * otherwise raise an error.
                                         */
 
                                        if (ch == 0)
                                        {
-                                               appendStringInfoString(lex->strval, "\\u0000");
+                                               /* We can't allow this, since our TEXT type doesn't */
+                                               ereport(ERROR,
+                                                               (errcode(ERRCODE_UNTRANSLATABLE_CHARACTER),
+                                                                errmsg("unsupported Unicode escape sequence"),
+                                                                errdetail("\\u0000 cannot be converted to text."),
+                                                                report_json_context(lex)));
                                        }
                                        else if (GetDatabaseEncoding() == PG_UTF8)
                                        {
@@ -791,8 +899,8 @@ json_lex_string(JsonLexContext *lex)
                                        else
                                        {
                                                ereport(ERROR,
-                                                               (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                                                errmsg("invalid input syntax for type json"),
+                                                               (errcode(ERRCODE_UNTRANSLATABLE_CHARACTER),
+                                                                errmsg("unsupported Unicode escape sequence"),
                                                                 errdetail("Unicode escape values cannot be used for code point values above 007F when the server encoding is not UTF8."),
                                                                 report_json_context(lex)));
                                        }
@@ -804,7 +912,8 @@ json_lex_string(JsonLexContext *lex)
                                if (hi_surrogate != -1)
                                        ereport(ERROR,
                                                        (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                                        errmsg("invalid input syntax for type json"),
+                                                        errmsg("invalid input syntax for type %s",
+                                                                       "json"),
                                                         errdetail("Unicode low surrogate must follow a high surrogate."),
                                                         report_json_context(lex)));
 
@@ -835,9 +944,10 @@ json_lex_string(JsonLexContext *lex)
                                                lex->token_terminator = s + pg_mblen(s);
                                                ereport(ERROR,
                                                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                                                errmsg("invalid input syntax for type json"),
-                                                       errdetail("Escape sequence \"\\%s\" is invalid.",
-                                                                         extract_mb_char(s)),
+                                                                errmsg("invalid input syntax for type %s",
+                                                                               "json"),
+                                                                errdetail("Escape sequence \"\\%s\" is invalid.",
+                                                                                  extract_mb_char(s)),
                                                                 report_json_context(lex)));
                                }
                        }
@@ -853,7 +963,7 @@ json_lex_string(JsonLexContext *lex)
                                lex->token_terminator = s + pg_mblen(s);
                                ereport(ERROR,
                                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                                errmsg("invalid input syntax for type json"),
+                                                errmsg("invalid input syntax for type %s", "json"),
                                                 errdetail("Escape sequence \"\\%s\" is invalid.",
                                                                   extract_mb_char(s)),
                                                 report_json_context(lex)));
@@ -865,7 +975,7 @@ json_lex_string(JsonLexContext *lex)
                        if (hi_surrogate != -1)
                                ereport(ERROR,
                                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                                errmsg("invalid input syntax for type json"),
+                                                errmsg("invalid input syntax for type %s", "json"),
                                                 errdetail("Unicode low surrogate must follow a high surrogate."),
                                                 report_json_context(lex)));
 
@@ -877,8 +987,8 @@ json_lex_string(JsonLexContext *lex)
        if (hi_surrogate != -1)
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                errmsg("invalid input syntax for type json"),
-                       errdetail("Unicode low surrogate must follow a high surrogate."),
+                                errmsg("invalid input syntax for type %s", "json"),
+                                errdetail("Unicode low surrogate must follow a high surrogate."),
                                 report_json_context(lex)));
 
        /* Hooray, we found the end of the string! */
@@ -886,7 +996,7 @@ json_lex_string(JsonLexContext *lex)
        lex->token_terminator = s + 1;
 }
 
-/*-------------------------------------------------------------------------
+/*
  * The next token in the input stream is known to be a number; lex it.
  *
  * In JSON, a number consists of four parts:
@@ -907,29 +1017,30 @@ json_lex_string(JsonLexContext *lex)
  *        followed by at least one digit.)
  *
  * The 's' argument to this function points to the ostensible beginning
- * of part 2 - i.e. the character after any optional minus sign, and the
+ * of part 2 - i.e. the character after any optional minus sign, or the
  * first character of the string if there is none.
  *
- *-------------------------------------------------------------------------
+ * If num_err is not NULL, we return an error flag to *num_err rather than
+ * raising an error for a badly-formed number.  Also, if total_len is not NULL
+ * the distance from lex->input to the token end+1 is returned to *total_len.
  */
 static inline void
-json_lex_number(JsonLexContext *lex, char *s, bool *num_err)
+json_lex_number(JsonLexContext *lex, char *s,
+                               bool *num_err, int *total_len)
 {
        bool            error = false;
-       char       *p;
-       int                     len;
+       int                     len = s - lex->input;
 
-       len = s - lex->input;
        /* Part (1): leading sign indicator. */
        /* Caller already did this for us; so do nothing. */
 
        /* Part (2): parse main digit string. */
-       if (*s == '0')
+       if (len < lex->input_length && *s == '0')
        {
                s++;
                len++;
        }
-       else if (*s >= '1' && *s <= '9')
+       else if (len < lex->input_length && *s >= '1' && *s <= '9')
        {
                do
                {
@@ -984,18 +1095,23 @@ json_lex_number(JsonLexContext *lex, char *s, bool *num_err)
         * here should be considered part of the token for error-reporting
         * purposes.
         */
-       for (p = s; len < lex->input_length && JSON_ALPHANUMERIC_CHAR(*p); p++, len++)
+       for (; len < lex->input_length && JSON_ALPHANUMERIC_CHAR(*s); s++, len++)
                error = true;
 
+       if (total_len != NULL)
+               *total_len = len;
+
        if (num_err != NULL)
        {
-               /* let the caller handle the error */
+               /* let the caller handle any error */
                *num_err = error;
        }
        else
        {
+               /* return token endpoint */
                lex->prev_token_terminator = lex->token_terminator;
-               lex->token_terminator = p;
+               lex->token_terminator = s;
+               /* handle error if any */
                if (error)
                        report_invalid_token(lex);
        }
@@ -1016,7 +1132,7 @@ report_parse_error(JsonParseContext ctx, JsonLexContext *lex)
        if (lex->token_start == NULL || lex->token_type == JSON_TOKEN_END)
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                errmsg("invalid input syntax for type json"),
+                                errmsg("invalid input syntax for type %s", "json"),
                                 errdetail("The input string ended unexpectedly."),
                                 report_json_context(lex)));
 
@@ -1030,7 +1146,7 @@ report_parse_error(JsonParseContext ctx, JsonLexContext *lex)
        if (ctx == JSON_PARSE_END)
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                errmsg("invalid input syntax for type json"),
+                                errmsg("invalid input syntax for type %s", "json"),
                                 errdetail("Expected end of input, but found \"%s\".",
                                                   token),
                                 report_json_context(lex)));
@@ -1041,7 +1157,7 @@ report_parse_error(JsonParseContext ctx, JsonLexContext *lex)
                        case JSON_PARSE_VALUE:
                                ereport(ERROR,
                                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                                errmsg("invalid input syntax for type json"),
+                                                errmsg("invalid input syntax for type %s", "json"),
                                                 errdetail("Expected JSON value, but found \"%s\".",
                                                                   token),
                                                 report_json_context(lex)));
@@ -1049,7 +1165,7 @@ report_parse_error(JsonParseContext ctx, JsonLexContext *lex)
                        case JSON_PARSE_STRING:
                                ereport(ERROR,
                                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                                errmsg("invalid input syntax for type json"),
+                                                errmsg("invalid input syntax for type %s", "json"),
                                                 errdetail("Expected string, but found \"%s\".",
                                                                   token),
                                                 report_json_context(lex)));
@@ -1057,7 +1173,7 @@ report_parse_error(JsonParseContext ctx, JsonLexContext *lex)
                        case JSON_PARSE_ARRAY_START:
                                ereport(ERROR,
                                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                                errmsg("invalid input syntax for type json"),
+                                                errmsg("invalid input syntax for type %s", "json"),
                                                 errdetail("Expected array element or \"]\", but found \"%s\".",
                                                                   token),
                                                 report_json_context(lex)));
@@ -1065,23 +1181,23 @@ report_parse_error(JsonParseContext ctx, JsonLexContext *lex)
                        case JSON_PARSE_ARRAY_NEXT:
                                ereport(ERROR,
                                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                                errmsg("invalid input syntax for type json"),
-                                         errdetail("Expected \",\" or \"]\", but found \"%s\".",
-                                                               token),
+                                                errmsg("invalid input syntax for type %s", "json"),
+                                                errdetail("Expected \",\" or \"]\", but found \"%s\".",
+                                                                  token),
                                                 report_json_context(lex)));
                                break;
                        case JSON_PARSE_OBJECT_START:
                                ereport(ERROR,
                                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                                errmsg("invalid input syntax for type json"),
-                                        errdetail("Expected string or \"}\", but found \"%s\".",
-                                                          token),
+                                                errmsg("invalid input syntax for type %s", "json"),
+                                                errdetail("Expected string or \"}\", but found \"%s\".",
+                                                                  token),
                                                 report_json_context(lex)));
                                break;
                        case JSON_PARSE_OBJECT_LABEL:
                                ereport(ERROR,
                                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                                errmsg("invalid input syntax for type json"),
+                                                errmsg("invalid input syntax for type %s", "json"),
                                                 errdetail("Expected \":\", but found \"%s\".",
                                                                   token),
                                                 report_json_context(lex)));
@@ -1089,15 +1205,15 @@ report_parse_error(JsonParseContext ctx, JsonLexContext *lex)
                        case JSON_PARSE_OBJECT_NEXT:
                                ereport(ERROR,
                                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                                errmsg("invalid input syntax for type json"),
-                                         errdetail("Expected \",\" or \"}\", but found \"%s\".",
-                                                               token),
+                                                errmsg("invalid input syntax for type %s", "json"),
+                                                errdetail("Expected \",\" or \"}\", but found \"%s\".",
+                                                                  token),
                                                 report_json_context(lex)));
                                break;
                        case JSON_PARSE_OBJECT_COMMA:
                                ereport(ERROR,
                                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                                errmsg("invalid input syntax for type json"),
+                                                errmsg("invalid input syntax for type %s", "json"),
                                                 errdetail("Expected string, but found \"%s\".",
                                                                   token),
                                                 report_json_context(lex)));
@@ -1127,7 +1243,7 @@ report_invalid_token(JsonLexContext *lex)
 
        ereport(ERROR,
                        (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                        errmsg("invalid input syntax for type json"),
+                        errmsg("invalid input syntax for type %s", "json"),
                         errdetail("Token \"%s\" is invalid.", token),
                         report_json_context(lex)));
 }
@@ -1222,19 +1338,126 @@ extract_mb_char(char *s)
 }
 
 /*
- * Turn a scalar Datum into JSON, appending the string to "result".
+ * Determine how we want to print values of a given type in datum_to_json.
  *
- * Hand off a non-scalar datum to composite_to_json or array_to_json_internal
- * as appropriate.
+ * Given the datatype OID, return its JsonTypeCategory, as well as the type's
+ * output function OID.  If the returned category is JSONTYPE_CAST, we
+ * return the OID of the type->JSON cast function instead.
+ */
+static void
+json_categorize_type(Oid typoid,
+                                        JsonTypeCategory *tcategory,
+                                        Oid *outfuncoid)
+{
+       bool            typisvarlena;
+
+       /* Look through any domain */
+       typoid = getBaseType(typoid);
+
+       *outfuncoid = InvalidOid;
+
+       /*
+        * We need to get the output function for everything except date and
+        * timestamp types, array and composite types, booleans, and non-builtin
+        * types where there's a cast to json.
+        */
+
+       switch (typoid)
+       {
+               case BOOLOID:
+                       *tcategory = JSONTYPE_BOOL;
+                       break;
+
+               case INT2OID:
+               case INT4OID:
+               case INT8OID:
+               case FLOAT4OID:
+               case FLOAT8OID:
+               case NUMERICOID:
+                       getTypeOutputInfo(typoid, outfuncoid, &typisvarlena);
+                       *tcategory = JSONTYPE_NUMERIC;
+                       break;
+
+               case DATEOID:
+                       *tcategory = JSONTYPE_DATE;
+                       break;
+
+               case TIMESTAMPOID:
+                       *tcategory = JSONTYPE_TIMESTAMP;
+                       break;
+
+               case TIMESTAMPTZOID:
+                       *tcategory = JSONTYPE_TIMESTAMPTZ;
+                       break;
+
+               case JSONOID:
+               case JSONBOID:
+                       getTypeOutputInfo(typoid, outfuncoid, &typisvarlena);
+                       *tcategory = JSONTYPE_JSON;
+                       break;
+
+               default:
+                       /* Check for arrays and composites */
+                       if (OidIsValid(get_element_type(typoid)) || typoid == ANYARRAYOID
+                               || typoid == RECORDARRAYOID)
+                               *tcategory = JSONTYPE_ARRAY;
+                       else if (type_is_rowtype(typoid))       /* includes RECORDOID */
+                               *tcategory = JSONTYPE_COMPOSITE;
+                       else
+                       {
+                               /* It's probably the general case ... */
+                               *tcategory = JSONTYPE_OTHER;
+                               /* but let's look for a cast to json, if it's not built-in */
+                               if (typoid >= FirstNormalObjectId)
+                               {
+                                       Oid                     castfunc;
+                                       CoercionPathType ctype;
+
+                                       ctype = find_coercion_pathway(JSONOID, typoid,
+                                                                                                 COERCION_EXPLICIT,
+                                                                                                 &castfunc);
+                                       if (ctype == COERCION_PATH_FUNC && OidIsValid(castfunc))
+                                       {
+                                               *tcategory = JSONTYPE_CAST;
+                                               *outfuncoid = castfunc;
+                                       }
+                                       else
+                                       {
+                                               /* non builtin type with no cast */
+                                               getTypeOutputInfo(typoid, outfuncoid, &typisvarlena);
+                                       }
+                               }
+                               else
+                               {
+                                       /* any other builtin type */
+                                       getTypeOutputInfo(typoid, outfuncoid, &typisvarlena);
+                               }
+                       }
+                       break;
+       }
+}
+
+/*
+ * Turn a Datum into JSON text, appending the string to "result".
+ *
+ * tcategory and outfuncoid are from a previous call to json_categorize_type,
+ * except that if is_null is true then they can be invalid.
+ *
+ * If key_scalar is true, the value is being printed as a key, so insist
+ * it's of an acceptable type, and force it to be quoted.
  */
 static void
 datum_to_json(Datum val, bool is_null, StringInfo result,
-                         TYPCATEGORY tcategory, Oid typoutputfunc, bool key_scalar)
+                         JsonTypeCategory tcategory, Oid outfuncoid,
+                         bool key_scalar)
 {
        char       *outputstr;
        text       *jsontext;
-       bool            numeric_error;
-       JsonLexContext dummy_lex;
+
+       check_stack_depth();
+
+       /* callers are expected to ensure that null keys are not passed in */
+       Assert(!(key_scalar && is_null));
 
        if (is_null)
        {
@@ -1242,68 +1465,210 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
                return;
        }
 
+       if (key_scalar &&
+               (tcategory == JSONTYPE_ARRAY ||
+                tcategory == JSONTYPE_COMPOSITE ||
+                tcategory == JSONTYPE_JSON ||
+                tcategory == JSONTYPE_CAST))
+               ereport(ERROR,
+                               (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+                                errmsg("key value must be scalar, not array, composite, or json")));
+
        switch (tcategory)
        {
-               case TYPCATEGORY_ARRAY:
+               case JSONTYPE_ARRAY:
                        array_to_json_internal(val, result, false);
                        break;
-               case TYPCATEGORY_COMPOSITE:
+               case JSONTYPE_COMPOSITE:
                        composite_to_json(val, result, false);
                        break;
-               case TYPCATEGORY_BOOLEAN:
-                       if (!key_scalar)
-                               appendStringInfoString(result, DatumGetBool(val) ? "true" : "false");
+               case JSONTYPE_BOOL:
+                       outputstr = DatumGetBool(val) ? "true" : "false";
+                       if (key_scalar)
+                               escape_json(result, outputstr);
                        else
-                               escape_json(result, DatumGetBool(val) ? "true" : "false");
+                               appendStringInfoString(result, outputstr);
                        break;
-               case TYPCATEGORY_NUMERIC:
-                       outputstr = OidOutputFunctionCall(typoutputfunc, val);
-                       if (key_scalar)
-                       {
-                               /* always quote keys */
+               case JSONTYPE_NUMERIC:
+                       outputstr = OidOutputFunctionCall(outfuncoid, val);
+
+                       /*
+                        * Don't call escape_json for a non-key if it's a valid JSON
+                        * number.
+                        */
+                       if (!key_scalar && IsValidJsonNumber(outputstr, strlen(outputstr)))
+                               appendStringInfoString(result, outputstr);
+                       else
                                escape_json(result, outputstr);
+                       pfree(outputstr);
+                       break;
+               case JSONTYPE_DATE:
+                       {
+                               char            buf[MAXDATELEN + 1];
+
+                               JsonEncodeDateTime(buf, val, DATEOID, NULL);
+                               appendStringInfo(result, "\"%s\"", buf);
                        }
-                       else
+                       break;
+               case JSONTYPE_TIMESTAMP:
                        {
-                               /*
-                                * Don't call escape_json for a non-key if it's a valid JSON
-                                * number.
-                                */
-                               dummy_lex.input = *outputstr == '-' ? outputstr + 1 : outputstr;
-                               dummy_lex.input_length = strlen(dummy_lex.input);
-                               json_lex_number(&dummy_lex, dummy_lex.input, &numeric_error);
-                               if (!numeric_error)
-                                       appendStringInfoString(result, outputstr);
-                               else
-                                       escape_json(result, outputstr);
+                               char            buf[MAXDATELEN + 1];
+
+                               JsonEncodeDateTime(buf, val, TIMESTAMPOID, NULL);
+                               appendStringInfo(result, "\"%s\"", buf);
                        }
-                       pfree(outputstr);
                        break;
-               case TYPCATEGORY_JSON:
-                       /* JSON and JSONB will already be escaped */
-                       outputstr = OidOutputFunctionCall(typoutputfunc, val);
+               case JSONTYPE_TIMESTAMPTZ:
+                       {
+                               char            buf[MAXDATELEN + 1];
+
+                               JsonEncodeDateTime(buf, val, TIMESTAMPTZOID, NULL);
+                               appendStringInfo(result, "\"%s\"", buf);
+                       }
+                       break;
+               case JSONTYPE_JSON:
+                       /* JSON and JSONB output will already be escaped */
+                       outputstr = OidOutputFunctionCall(outfuncoid, val);
                        appendStringInfoString(result, outputstr);
                        pfree(outputstr);
                        break;
-               case TYPCATEGORY_JSON_CAST:
-                       jsontext = DatumGetTextP(OidFunctionCall1(typoutputfunc, val));
+               case JSONTYPE_CAST:
+                       /* outfuncoid refers to a cast function, not an output function */
+                       jsontext = DatumGetTextPP(OidFunctionCall1(outfuncoid, val));
                        outputstr = text_to_cstring(jsontext);
                        appendStringInfoString(result, outputstr);
                        pfree(outputstr);
                        pfree(jsontext);
                        break;
                default:
-                       outputstr = OidOutputFunctionCall(typoutputfunc, val);
-                       if (key_scalar && *outputstr == '\0')
-                               ereport(ERROR,
-                                               (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                                                errmsg("key value must not be empty")));
+                       outputstr = OidOutputFunctionCall(outfuncoid, val);
                        escape_json(result, outputstr);
                        pfree(outputstr);
                        break;
        }
 }
 
+/*
+ * Encode 'value' of datetime type 'typid' into JSON string in ISO format using
+ * optionally preallocated buffer 'buf'.  Optional 'tzp' determines time-zone
+ * offset (in seconds) in which we want to show timestamptz.
+ */
+char *
+JsonEncodeDateTime(char *buf, Datum value, Oid typid, const int *tzp)
+{
+       if (!buf)
+               buf = palloc(MAXDATELEN + 1);
+
+       switch (typid)
+       {
+               case DATEOID:
+                       {
+                               DateADT         date;
+                               struct pg_tm tm;
+
+                               date = DatumGetDateADT(value);
+
+                               /* Same as date_out(), but forcing DateStyle */
+                               if (DATE_NOT_FINITE(date))
+                                       EncodeSpecialDate(date, buf);
+                               else
+                               {
+                                       j2date(date + POSTGRES_EPOCH_JDATE,
+                                                  &(tm.tm_year), &(tm.tm_mon), &(tm.tm_mday));
+                                       EncodeDateOnly(&tm, USE_XSD_DATES, buf);
+                               }
+                       }
+                       break;
+               case TIMEOID:
+                       {
+                               TimeADT         time = DatumGetTimeADT(value);
+                               struct pg_tm tt,
+                                                  *tm = &tt;
+                               fsec_t          fsec;
+
+                               /* Same as time_out(), but forcing DateStyle */
+                               time2tm(time, tm, &fsec);
+                               EncodeTimeOnly(tm, fsec, false, 0, USE_XSD_DATES, buf);
+                       }
+                       break;
+               case TIMETZOID:
+                       {
+                               TimeTzADT  *time = DatumGetTimeTzADTP(value);
+                               struct pg_tm tt,
+                                                  *tm = &tt;
+                               fsec_t          fsec;
+                               int                     tz;
+
+                               /* Same as timetz_out(), but forcing DateStyle */
+                               timetz2tm(time, tm, &fsec, &tz);
+                               EncodeTimeOnly(tm, fsec, true, tz, USE_XSD_DATES, buf);
+                       }
+                       break;
+               case TIMESTAMPOID:
+                       {
+                               Timestamp       timestamp;
+                               struct pg_tm tm;
+                               fsec_t          fsec;
+
+                               timestamp = DatumGetTimestamp(value);
+                               /* Same as timestamp_out(), but forcing DateStyle */
+                               if (TIMESTAMP_NOT_FINITE(timestamp))
+                                       EncodeSpecialTimestamp(timestamp, buf);
+                               else if (timestamp2tm(timestamp, NULL, &tm, &fsec, NULL, NULL) == 0)
+                                       EncodeDateTime(&tm, fsec, false, 0, NULL, USE_XSD_DATES, buf);
+                               else
+                                       ereport(ERROR,
+                                                       (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+                                                        errmsg("timestamp out of range")));
+                       }
+                       break;
+               case TIMESTAMPTZOID:
+                       {
+                               TimestampTz timestamp;
+                               struct pg_tm tm;
+                               int                     tz;
+                               fsec_t          fsec;
+                               const char *tzn = NULL;
+
+                               timestamp = DatumGetTimestampTz(value);
+
+                               /*
+                                * If a time zone is specified, we apply the time-zone shift,
+                                * convert timestamptz to pg_tm as if it were without a time
+                                * zone, and then use the specified time zone for converting
+                                * the 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, 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),
+                                                        errmsg("timestamp out of range")));
+                       }
+                       break;
+               default:
+                       elog(ERROR, "unknown jsonb value datetime type oid %d", typid);
+                       return NULL;
+       }
+
+       return buf;
+}
+
 /*
  * Process a single dimension of an array.
  * If it's the innermost dimension, output the values, otherwise call
@@ -1311,8 +1676,8 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
  */
 static void
 array_dim_to_json(StringInfo result, int dim, int ndims, int *dims, Datum *vals,
-                                 bool *nulls, int *valcount, TYPCATEGORY tcategory,
-                                 Oid typoutputfunc, bool use_line_feeds)
+                                 bool *nulls, int *valcount, JsonTypeCategory tcategory,
+                                 Oid outfuncoid, bool use_line_feeds)
 {
        int                     i;
        const char *sep;
@@ -1331,7 +1696,7 @@ array_dim_to_json(StringInfo result, int dim, int ndims, int *dims, Datum *vals,
                if (dim + 1 == ndims)
                {
                        datum_to_json(vals[*valcount], nulls[*valcount], result, tcategory,
-                                                 typoutputfunc, false);
+                                                 outfuncoid, false);
                        (*valcount)++;
                }
                else
@@ -1341,7 +1706,7 @@ array_dim_to_json(StringInfo result, int dim, int ndims, int *dims, Datum *vals,
                         * we'll say no.
                         */
                        array_dim_to_json(result, dim + 1, ndims, dims, vals, nulls,
-                                                         valcount, tcategory, typoutputfunc, false);
+                                                         valcount, tcategory, outfuncoid, false);
                }
        }
 
@@ -1364,12 +1729,9 @@ array_to_json_internal(Datum array, StringInfo result, bool use_line_feeds)
        bool       *nulls;
        int16           typlen;
        bool            typbyval;
-       char            typalign,
-                               typdelim;
-       Oid                     typioparam;
-       Oid                     typoutputfunc;
-       TYPCATEGORY tcategory;
-       Oid                     castfunc = InvalidOid;
+       char            typalign;
+       JsonTypeCategory tcategory;
+       Oid                     outfuncoid;
 
        ndim = ARR_NDIM(v);
        dim = ARR_DIMS(v);
@@ -1381,44 +1743,18 @@ array_to_json_internal(Datum array, StringInfo result, bool use_line_feeds)
                return;
        }
 
-       get_type_io_data(element_type, IOFunc_output,
-                                        &typlen, &typbyval, &typalign,
-                                        &typdelim, &typioparam, &typoutputfunc);
-
-       if (element_type > FirstNormalObjectId)
-       {
-               HeapTuple       tuple;
-               Form_pg_cast castForm;
-
-               tuple = SearchSysCache2(CASTSOURCETARGET,
-                                                               ObjectIdGetDatum(element_type),
-                                                               ObjectIdGetDatum(JSONOID));
-               if (HeapTupleIsValid(tuple))
-               {
-                       castForm = (Form_pg_cast) GETSTRUCT(tuple);
-
-                       if (castForm->castmethod == COERCION_METHOD_FUNCTION)
-                               castfunc = typoutputfunc = castForm->castfunc;
+       get_typlenbyvalalign(element_type,
+                                                &typlen, &typbyval, &typalign);
 
-                       ReleaseSysCache(tuple);
-               }
-       }
+       json_categorize_type(element_type,
+                                                &tcategory, &outfuncoid);
 
        deconstruct_array(v, element_type, typlen, typbyval,
                                          typalign, &elements, &nulls,
                                          &nitems);
 
-       if (castfunc != InvalidOid)
-               tcategory = TYPCATEGORY_JSON_CAST;
-       else if (element_type == RECORDOID)
-               tcategory = TYPCATEGORY_COMPOSITE;
-       else if (element_type == JSONOID || element_type == JSONBOID)
-               tcategory = TYPCATEGORY_JSON;
-       else
-               tcategory = TypeCategory(element_type);
-
        array_dim_to_json(result, 0, ndim, dim, elements, nulls, &count, tcategory,
-                                         typoutputfunc, use_line_feeds);
+                                         outfuncoid, use_line_feeds);
 
        pfree(elements);
        pfree(nulls);
@@ -1461,59 +1797,32 @@ composite_to_json(Datum composite, StringInfo result, bool use_line_feeds)
                Datum           val;
                bool            isnull;
                char       *attname;
-               TYPCATEGORY tcategory;
-               Oid                     typoutput;
-               bool            typisvarlena;
-               Oid                     castfunc = InvalidOid;
+               JsonTypeCategory tcategory;
+               Oid                     outfuncoid;
+               Form_pg_attribute att = TupleDescAttr(tupdesc, i);
 
-               if (tupdesc->attrs[i]->attisdropped)
+               if (att->attisdropped)
                        continue;
 
                if (needsep)
                        appendStringInfoString(result, sep);
                needsep = true;
 
-               attname = NameStr(tupdesc->attrs[i]->attname);
+               attname = NameStr(att->attname);
                escape_json(result, attname);
                appendStringInfoChar(result, ':');
 
                val = heap_getattr(tuple, i + 1, tupdesc, &isnull);
 
-               getTypeOutputInfo(tupdesc->attrs[i]->atttypid,
-                                                 &typoutput, &typisvarlena);
-
-               if (tupdesc->attrs[i]->atttypid > FirstNormalObjectId)
+               if (isnull)
                {
-                       HeapTuple       cast_tuple;
-                       Form_pg_cast castForm;
-
-                       cast_tuple = SearchSysCache2(CASTSOURCETARGET,
-                                                          ObjectIdGetDatum(tupdesc->attrs[i]->atttypid),
-                                                                                ObjectIdGetDatum(JSONOID));
-                       if (HeapTupleIsValid(cast_tuple))
-                       {
-                               castForm = (Form_pg_cast) GETSTRUCT(cast_tuple);
-
-                               if (castForm->castmethod == COERCION_METHOD_FUNCTION)
-                                       castfunc = typoutput = castForm->castfunc;
-
-                               ReleaseSysCache(cast_tuple);
-                       }
+                       tcategory = JSONTYPE_NULL;
+                       outfuncoid = InvalidOid;
                }
-
-               if (castfunc != InvalidOid)
-                       tcategory = TYPCATEGORY_JSON_CAST;
-               else if (tupdesc->attrs[i]->atttypid == RECORDARRAYOID)
-                       tcategory = TYPCATEGORY_ARRAY;
-               else if (tupdesc->attrs[i]->atttypid == RECORDOID)
-                       tcategory = TYPCATEGORY_COMPOSITE;
-               else if (tupdesc->attrs[i]->atttypid == JSONOID ||
-                                tupdesc->attrs[i]->atttypid == JSONBOID)
-                       tcategory = TYPCATEGORY_JSON;
                else
-                       tcategory = TypeCategory(tupdesc->attrs[i]->atttypid);
+                       json_categorize_type(att->atttypid, &tcategory, &outfuncoid);
 
-               datum_to_json(val, isnull, result, tcategory, typoutput, false);
+               datum_to_json(val, isnull, result, tcategory, outfuncoid, false);
        }
 
        appendStringInfoChar(result, '}');
@@ -1521,71 +1830,40 @@ composite_to_json(Datum composite, StringInfo result, bool use_line_feeds)
 }
 
 /*
- * append Json for orig_val to result. If it's a field key, make sure it's
- * of an acceptable type and is quoted.
+ * Append JSON text for "val" to "result".
+ *
+ * This is just a thin wrapper around datum_to_json.  If the same type will be
+ * printed many times, avoid using this; better to do the json_categorize_type
+ * lookups only once.
  */
 static void
-add_json(Datum val, bool is_null, StringInfo result, Oid val_type, bool key_scalar)
+add_json(Datum val, bool is_null, StringInfo result,
+                Oid val_type, bool key_scalar)
 {
-       TYPCATEGORY tcategory;
-       Oid                     typoutput;
-       bool            typisvarlena;
-       Oid                     castfunc = InvalidOid;
+       JsonTypeCategory tcategory;
+       Oid                     outfuncoid;
 
        if (val_type == InvalidOid)
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
                                 errmsg("could not determine input data type")));
 
-
-       getTypeOutputInfo(val_type, &typoutput, &typisvarlena);
-
-       if (val_type > FirstNormalObjectId)
+       if (is_null)
        {
-               HeapTuple       tuple;
-               Form_pg_cast castForm;
-
-               tuple = SearchSysCache2(CASTSOURCETARGET,
-                                                               ObjectIdGetDatum(val_type),
-                                                               ObjectIdGetDatum(JSONOID));
-               if (HeapTupleIsValid(tuple))
-               {
-                       castForm = (Form_pg_cast) GETSTRUCT(tuple);
-
-                       if (castForm->castmethod == COERCION_METHOD_FUNCTION)
-                               castfunc = typoutput = castForm->castfunc;
-
-                       ReleaseSysCache(tuple);
-               }
+               tcategory = JSONTYPE_NULL;
+               outfuncoid = InvalidOid;
        }
-
-       if (castfunc != InvalidOid)
-               tcategory = TYPCATEGORY_JSON_CAST;
-       else if (val_type == RECORDARRAYOID)
-               tcategory = TYPCATEGORY_ARRAY;
-       else if (val_type == RECORDOID)
-               tcategory = TYPCATEGORY_COMPOSITE;
-       else if (val_type == JSONOID)
-               tcategory = TYPCATEGORY_JSON;
        else
-               tcategory = TypeCategory(val_type);
-
-       if (key_scalar &&
-               (tcategory == TYPCATEGORY_ARRAY ||
-                tcategory == TYPCATEGORY_COMPOSITE ||
-                tcategory == TYPCATEGORY_JSON ||
-                tcategory == TYPCATEGORY_JSON_CAST))
-               ereport(ERROR,
-                               (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                 errmsg("key value must be scalar, not array, composite or json")));
+               json_categorize_type(val_type,
+                                                        &tcategory, &outfuncoid);
 
-       datum_to_json(val, is_null, result, tcategory, typoutput, key_scalar);
+       datum_to_json(val, is_null, result, tcategory, outfuncoid, key_scalar);
 }
 
 /*
  * SQL function array_to_json(row)
  */
-extern Datum
+Datum
 array_to_json(PG_FUNCTION_ARGS)
 {
        Datum           array = PG_GETARG_DATUM(0);
@@ -1601,7 +1879,7 @@ array_to_json(PG_FUNCTION_ARGS)
 /*
  * SQL function array_to_json(row, prettybool)
  */
-extern Datum
+Datum
 array_to_json_pretty(PG_FUNCTION_ARGS)
 {
        Datum           array = PG_GETARG_DATUM(0);
@@ -1618,7 +1896,7 @@ array_to_json_pretty(PG_FUNCTION_ARGS)
 /*
  * SQL function row_to_json(row)
  */
-extern Datum
+Datum
 row_to_json(PG_FUNCTION_ARGS)
 {
        Datum           array = PG_GETARG_DATUM(0);
@@ -1634,7 +1912,7 @@ row_to_json(PG_FUNCTION_ARGS)
 /*
  * SQL function row_to_json(row, prettybool)
  */
-extern Datum
+Datum
 row_to_json_pretty(PG_FUNCTION_ARGS)
 {
        Datum           array = PG_GETARG_DATUM(0);
@@ -1657,75 +1935,36 @@ to_json(PG_FUNCTION_ARGS)
        Datum           val = PG_GETARG_DATUM(0);
        Oid                     val_type = get_fn_expr_argtype(fcinfo->flinfo, 0);
        StringInfo      result;
-       TYPCATEGORY tcategory;
-       Oid                     typoutput;
-       bool            typisvarlena;
-       Oid                     castfunc = InvalidOid;
+       JsonTypeCategory tcategory;
+       Oid                     outfuncoid;
 
        if (val_type == InvalidOid)
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
                                 errmsg("could not determine input data type")));
 
-       result = makeStringInfo();
-
-       getTypeOutputInfo(val_type, &typoutput, &typisvarlena);
-
-       if (val_type > FirstNormalObjectId)
-       {
-               HeapTuple       tuple;
-               Form_pg_cast castForm;
-
-               tuple = SearchSysCache2(CASTSOURCETARGET,
-                                                               ObjectIdGetDatum(val_type),
-                                                               ObjectIdGetDatum(JSONOID));
-               if (HeapTupleIsValid(tuple))
-               {
-                       castForm = (Form_pg_cast) GETSTRUCT(tuple);
+       json_categorize_type(val_type,
+                                                &tcategory, &outfuncoid);
 
-                       if (castForm->castmethod == COERCION_METHOD_FUNCTION)
-                               castfunc = typoutput = castForm->castfunc;
-
-                       ReleaseSysCache(tuple);
-               }
-       }
-
-       if (castfunc != InvalidOid)
-               tcategory = TYPCATEGORY_JSON_CAST;
-       else if (val_type == RECORDARRAYOID)
-               tcategory = TYPCATEGORY_ARRAY;
-       else if (val_type == RECORDOID)
-               tcategory = TYPCATEGORY_COMPOSITE;
-       else if (val_type == JSONOID || val_type == JSONBOID)
-               tcategory = TYPCATEGORY_JSON;
-       else
-               tcategory = TypeCategory(val_type);
+       result = makeStringInfo();
 
-       datum_to_json(val, false, result, tcategory, typoutput, false);
+       datum_to_json(val, false, result, tcategory, outfuncoid, false);
 
        PG_RETURN_TEXT_P(cstring_to_text_with_len(result->data, result->len));
 }
 
 /*
  * json_agg transition function
+ *
+ * aggregate input column as a json array value.
  */
 Datum
 json_agg_transfn(PG_FUNCTION_ARGS)
 {
-       Oid                     val_type = get_fn_expr_argtype(fcinfo->flinfo, 1);
        MemoryContext aggcontext,
                                oldcontext;
-       StringInfo      state;
+       JsonAggState *state;
        Datum           val;
-       TYPCATEGORY tcategory;
-       Oid                     typoutput;
-       bool            typisvarlena;
-       Oid                     castfunc = InvalidOid;
-
-       if (val_type == InvalidOid)
-               ereport(ERROR,
-                               (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                                errmsg("could not determine input data type")));
 
        if (!AggCheckCallContext(fcinfo, &aggcontext))
        {
@@ -1735,78 +1974,59 @@ json_agg_transfn(PG_FUNCTION_ARGS)
 
        if (PG_ARGISNULL(0))
        {
+               Oid                     arg_type = get_fn_expr_argtype(fcinfo->flinfo, 1);
+
+               if (arg_type == InvalidOid)
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+                                        errmsg("could not determine input data type")));
+
                /*
-                * Make this StringInfo in a context where it will persist for the
-                * duration off the aggregate call. It's only needed for this initial
-                * piece, as the StringInfo routines make sure they use the right
-                * context to enlarge the object if necessary.
+                * Make this state object in a context where it will persist for the
+                * duration of the aggregate call.  MemoryContextSwitchTo is only
+                * needed the first time, as the StringInfo routines make sure they
+                * use the right context to enlarge the object if necessary.
                 */
                oldcontext = MemoryContextSwitchTo(aggcontext);
-               state = makeStringInfo();
+               state = (JsonAggState *) palloc(sizeof(JsonAggState));
+               state->str = makeStringInfo();
                MemoryContextSwitchTo(oldcontext);
 
-               appendStringInfoChar(state, '[');
+               appendStringInfoChar(state->str, '[');
+               json_categorize_type(arg_type, &state->val_category,
+                                                        &state->val_output_func);
        }
        else
        {
-               state = (StringInfo) PG_GETARG_POINTER(0);
-               appendStringInfoString(state, ", ");
+               state = (JsonAggState *) PG_GETARG_POINTER(0);
+               appendStringInfoString(state->str, ", ");
        }
 
        /* fast path for NULLs */
        if (PG_ARGISNULL(1))
        {
-               val = (Datum) 0;
-               datum_to_json(val, true, state, 0, InvalidOid, false);
+               datum_to_json((Datum) 0, true, state->str, JSONTYPE_NULL,
+                                         InvalidOid, false);
                PG_RETURN_POINTER(state);
        }
 
        val = PG_GETARG_DATUM(1);
 
-       getTypeOutputInfo(val_type, &typoutput, &typisvarlena);
-
-       if (val_type > FirstNormalObjectId)
-       {
-               HeapTuple       tuple;
-               Form_pg_cast castForm;
-
-               tuple = SearchSysCache2(CASTSOURCETARGET,
-                                                               ObjectIdGetDatum(val_type),
-                                                               ObjectIdGetDatum(JSONOID));
-               if (HeapTupleIsValid(tuple))
-               {
-                       castForm = (Form_pg_cast) GETSTRUCT(tuple);
-
-                       if (castForm->castmethod == COERCION_METHOD_FUNCTION)
-                               castfunc = typoutput = castForm->castfunc;
-
-                       ReleaseSysCache(tuple);
-               }
-       }
-
-       if (castfunc != InvalidOid)
-               tcategory = TYPCATEGORY_JSON_CAST;
-       else if (val_type == RECORDARRAYOID)
-               tcategory = TYPCATEGORY_ARRAY;
-       else if (val_type == RECORDOID)
-               tcategory = TYPCATEGORY_COMPOSITE;
-       else if (val_type == JSONOID || val_type == JSONBOID)
-               tcategory = TYPCATEGORY_JSON;
-       else
-               tcategory = TypeCategory(val_type);
-
+       /* add some whitespace if structured type and not first item */
        if (!PG_ARGISNULL(0) &&
-         (tcategory == TYPCATEGORY_ARRAY || tcategory == TYPCATEGORY_COMPOSITE))
+               (state->val_category == JSONTYPE_ARRAY ||
+                state->val_category == JSONTYPE_COMPOSITE))
        {
-               appendStringInfoString(state, "\n ");
+               appendStringInfoString(state->str, "\n ");
        }
 
-       datum_to_json(val, false, state, tcategory, typoutput, false);
+       datum_to_json(val, false, state->str, state->val_category,
+                                 state->val_output_func, false);
 
        /*
-        * The transition type for array_agg() is declared to be "internal", which
+        * The transition type for json_agg() is declared to be "internal", which
         * is a pass-by-value type the same size as a pointer.  So we can safely
-        * pass the ArrayBuildState pointer through nodeAgg.c's machinations.
+        * pass the JsonAggState pointer through nodeAgg.c's machinations.
         */
        PG_RETURN_POINTER(state);
 }
@@ -1817,137 +2037,155 @@ json_agg_transfn(PG_FUNCTION_ARGS)
 Datum
 json_agg_finalfn(PG_FUNCTION_ARGS)
 {
-       StringInfo      state;
+       JsonAggState *state;
 
        /* cannot be called directly because of internal-type argument */
        Assert(AggCheckCallContext(fcinfo, NULL));
 
-       state = PG_ARGISNULL(0) ? NULL : (StringInfo) PG_GETARG_POINTER(0);
+       state = PG_ARGISNULL(0) ?
+               NULL :
+               (JsonAggState *) PG_GETARG_POINTER(0);
 
+       /* NULL result for no rows in, as is standard with aggregates */
        if (state == NULL)
                PG_RETURN_NULL();
 
-       appendStringInfoChar(state, ']');
-
-       PG_RETURN_TEXT_P(cstring_to_text_with_len(state->data, state->len));
+       /* Else return state with appropriate array terminator added */
+       PG_RETURN_TEXT_P(catenate_stringinfo_string(state->str, "]"));
 }
 
 /*
  * json_object_agg transition function.
  *
- * aggregate two input columns as a single json value.
+ * aggregate two input columns as a single json object value.
  */
 Datum
 json_object_agg_transfn(PG_FUNCTION_ARGS)
 {
-       Oid                     val_type;
        MemoryContext aggcontext,
                                oldcontext;
-       StringInfo      state;
+       JsonAggState *state;
        Datum           arg;
 
        if (!AggCheckCallContext(fcinfo, &aggcontext))
        {
                /* cannot be called directly because of internal-type argument */
-               elog(ERROR, "json_agg_transfn called in non-aggregate context");
+               elog(ERROR, "json_object_agg_transfn called in non-aggregate context");
        }
 
        if (PG_ARGISNULL(0))
        {
+               Oid                     arg_type;
+
                /*
-                * Make this StringInfo in a context where it will persist for the
-                * duration off the aggregate call. It's only needed for this initial
-                * piece, as the StringInfo routines make sure they use the right
-                * context to enlarge the object if necessary.
+                * Make the StringInfo in a context where it will persist for the
+                * duration of the aggregate call. Switching context is only needed
+                * for this initial step, as the StringInfo routines make sure they
+                * use the right context to enlarge the object if necessary.
                 */
                oldcontext = MemoryContextSwitchTo(aggcontext);
-               state = makeStringInfo();
+               state = (JsonAggState *) palloc(sizeof(JsonAggState));
+               state->str = makeStringInfo();
                MemoryContextSwitchTo(oldcontext);
 
-               appendStringInfoString(state, "{ ");
-       }
-       else
-       {
-               state = (StringInfo) PG_GETARG_POINTER(0);
-               appendStringInfoString(state, ", ");
-       }
+               arg_type = get_fn_expr_argtype(fcinfo->flinfo, 1);
 
-       if (PG_ARGISNULL(1))
-               ereport(ERROR,
-                               (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                                errmsg("field name must not be null")));
+               if (arg_type == InvalidOid)
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+                                        errmsg("could not determine data type for argument %d", 1)));
 
+               json_categorize_type(arg_type, &state->key_category,
+                                                        &state->key_output_func);
 
-       val_type = get_fn_expr_argtype(fcinfo->flinfo, 1);
+               arg_type = get_fn_expr_argtype(fcinfo->flinfo, 2);
 
-       /*
-        * turn a constant (more or less literal) value that's of unknown type
-        * into text. Unknowns come in as a cstring pointer.
-        */
-       if (val_type == UNKNOWNOID && get_fn_expr_arg_stable(fcinfo->flinfo, 1))
-       {
-               val_type = TEXTOID;
-               arg = CStringGetTextDatum(PG_GETARG_POINTER(1));
+               if (arg_type == InvalidOid)
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+                                        errmsg("could not determine data type for argument %d", 2)));
+
+               json_categorize_type(arg_type, &state->val_category,
+                                                        &state->val_output_func);
+
+               appendStringInfoString(state->str, "{ ");
        }
        else
        {
-               arg = PG_GETARG_DATUM(1);
+               state = (JsonAggState *) PG_GETARG_POINTER(0);
+               appendStringInfoString(state->str, ", ");
        }
 
-       if (val_type == InvalidOid || val_type == UNKNOWNOID)
+       /*
+        * Note: since json_object_agg() is declared as taking type "any", the
+        * parser will not do any type conversion on unknown-type literals (that
+        * is, undecorated strings or NULLs).  Such values will arrive here as
+        * type UNKNOWN, which fortunately does not matter to us, since
+        * unknownout() works fine.
+        */
+
+       if (PG_ARGISNULL(1))
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                                errmsg("arg 1: could not determine data type")));
+                                errmsg("field name must not be null")));
 
-       add_json(arg, false, state, val_type, true);
+       arg = PG_GETARG_DATUM(1);
 
-       appendStringInfoString(state, " : ");
+       datum_to_json(arg, false, state->str, state->key_category,
+                                 state->key_output_func, true);
 
-       val_type = get_fn_expr_argtype(fcinfo->flinfo, 2);
-       /* see comments above */
-       if (val_type == UNKNOWNOID && get_fn_expr_arg_stable(fcinfo->flinfo, 2))
-       {
-               val_type = TEXTOID;
-               if (PG_ARGISNULL(2))
-                       arg = (Datum) 0;
-               else
-                       arg = CStringGetTextDatum(PG_GETARG_POINTER(2));
-       }
+       appendStringInfoString(state->str, " : ");
+
+       if (PG_ARGISNULL(2))
+               arg = (Datum) 0;
        else
-       {
                arg = PG_GETARG_DATUM(2);
-       }
 
-       if (val_type == InvalidOid || val_type == UNKNOWNOID)
-               ereport(ERROR,
-                               (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                                errmsg("arg 2: could not determine data type")));
-
-       add_json(arg, PG_ARGISNULL(2), state, val_type, false);
+       datum_to_json(arg, PG_ARGISNULL(2), state->str, state->val_category,
+                                 state->val_output_func, false);
 
        PG_RETURN_POINTER(state);
 }
 
 /*
  * json_object_agg final function.
- *
  */
 Datum
 json_object_agg_finalfn(PG_FUNCTION_ARGS)
 {
-       StringInfo      state;
+       JsonAggState *state;
 
        /* cannot be called directly because of internal-type argument */
        Assert(AggCheckCallContext(fcinfo, NULL));
 
-       state = PG_ARGISNULL(0) ? NULL : (StringInfo) PG_GETARG_POINTER(0);
+       state = PG_ARGISNULL(0) ? NULL : (JsonAggState *) PG_GETARG_POINTER(0);
 
+       /* NULL result for no rows in, as is standard with aggregates */
        if (state == NULL)
-               PG_RETURN_TEXT_P(cstring_to_text("{}"));
+               PG_RETURN_NULL();
+
+       /* Else return state with appropriate object terminator added */
+       PG_RETURN_TEXT_P(catenate_stringinfo_string(state->str, " }"));
+}
+
+/*
+ * Helper function for aggregates: return given StringInfo's contents plus
+ * specified trailing string, as a text datum.  We need this because aggregate
+ * final functions are not allowed to modify the aggregate state.
+ */
+static text *
+catenate_stringinfo_string(StringInfo buffer, const char *addon)
+{
+       /* custom version of cstring_to_text_with_len */
+       int                     buflen = buffer->len;
+       int                     addlen = strlen(addon);
+       text       *result = (text *) palloc(buflen + addlen + VARHDRSZ);
 
-       appendStringInfoString(state, " }");
+       SET_VARSIZE(result, buflen + addlen + VARHDRSZ);
+       memcpy(VARDATA(result), buffer->data, buflen);
+       memcpy(VARDATA(result) + buflen, addon, addlen);
 
-       PG_RETURN_TEXT_P(cstring_to_text_with_len(state->data, state->len));
+       return result;
 }
 
 /*
@@ -1958,16 +2196,25 @@ json_build_object(PG_FUNCTION_ARGS)
 {
        int                     nargs = PG_NARGS();
        int                     i;
-       Datum           arg;
-       char       *sep = "";
+       const char *sep = "";
        StringInfo      result;
-       Oid                     val_type;
+       Datum      *args;
+       bool       *nulls;
+       Oid                *types;
 
+       /* fetch argument values to build the object */
+       nargs = extract_variadic_args(fcinfo, 0, false, &args, &types, &nulls);
+
+       if (nargs < 0)
+               PG_RETURN_NULL();
 
        if (nargs % 2 != 0)
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                                errmsg("invalid number or arguments: object must be matched key value pairs")));
+                                errmsg("argument list must have even number of elements"),
+               /* translator: %s is a SQL function name */
+                                errhint("The arguments of %s must consist of alternating keys and values.",
+                                                "json_build_object()")));
 
        result = makeStringInfo();
 
@@ -1975,68 +2222,27 @@ json_build_object(PG_FUNCTION_ARGS)
 
        for (i = 0; i < nargs; i += 2)
        {
+               appendStringInfoString(result, sep);
+               sep = ", ";
 
                /* process key */
-
-               if (PG_ARGISNULL(i))
+               if (nulls[i])
                        ereport(ERROR,
                                        (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                                        errmsg("arg %d: key cannot be null", i + 1)));
-               val_type = get_fn_expr_argtype(fcinfo->flinfo, i);
+                                        errmsg("argument %d cannot be null", i + 1),
+                                        errhint("Object keys should be text.")));
 
-               /*
-                * turn a constant (more or less literal) value that's of unknown type
-                * into text. Unknowns come in as a cstring pointer.
-                */
-               if (val_type == UNKNOWNOID && get_fn_expr_arg_stable(fcinfo->flinfo, i))
-               {
-                       val_type = TEXTOID;
-                       if (PG_ARGISNULL(i))
-                               arg = (Datum) 0;
-                       else
-                               arg = CStringGetTextDatum(PG_GETARG_POINTER(i));
-               }
-               else
-               {
-                       arg = PG_GETARG_DATUM(i);
-               }
-               if (val_type == InvalidOid || val_type == UNKNOWNOID)
-                       ereport(ERROR,
-                                       (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                                        errmsg("arg %d: could not determine data type", i + 1)));
-               appendStringInfoString(result, sep);
-               sep = ", ";
-               add_json(arg, false, result, val_type, true);
+               add_json(args[i], false, result, types[i], true);
 
                appendStringInfoString(result, " : ");
 
                /* process value */
-
-               val_type = get_fn_expr_argtype(fcinfo->flinfo, i + 1);
-               /* see comments above */
-               if (val_type == UNKNOWNOID && get_fn_expr_arg_stable(fcinfo->flinfo, i + 1))
-               {
-                       val_type = TEXTOID;
-                       if (PG_ARGISNULL(i + 1))
-                               arg = (Datum) 0;
-                       else
-                               arg = CStringGetTextDatum(PG_GETARG_POINTER(i + 1));
-               }
-               else
-               {
-                       arg = PG_GETARG_DATUM(i + 1);
-               }
-               if (val_type == InvalidOid || val_type == UNKNOWNOID)
-                       ereport(ERROR,
-                                       (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                                        errmsg("arg %d: could not determine data type", i + 2)));
-               add_json(arg, PG_ARGISNULL(i + 1), result, val_type, false);
-
+               add_json(args[i + 1], nulls[i + 1], result, types[i + 1], false);
        }
+
        appendStringInfoChar(result, '}');
 
        PG_RETURN_TEXT_P(cstring_to_text_with_len(result->data, result->len));
-
 }
 
 /*
@@ -2054,13 +2260,19 @@ json_build_object_noargs(PG_FUNCTION_ARGS)
 Datum
 json_build_array(PG_FUNCTION_ARGS)
 {
-       int                     nargs = PG_NARGS();
+       int                     nargs;
        int                     i;
-       Datum           arg;
-       char       *sep = "";
+       const char *sep = "";
        StringInfo      result;
-       Oid                     val_type;
+       Datum      *args;
+       bool       *nulls;
+       Oid                *types;
 
+       /* fetch argument values to build the array */
+       nargs = extract_variadic_args(fcinfo, 0, false, &args, &types, &nulls);
+
+       if (nargs < 0)
+               PG_RETURN_NULL();
 
        result = makeStringInfo();
 
@@ -2068,33 +2280,14 @@ json_build_array(PG_FUNCTION_ARGS)
 
        for (i = 0; i < nargs; i++)
        {
-               val_type = get_fn_expr_argtype(fcinfo->flinfo, i);
-               arg = PG_GETARG_DATUM(i + 1);
-               /* see comments in json_build_object above */
-               if (val_type == UNKNOWNOID && get_fn_expr_arg_stable(fcinfo->flinfo, i))
-               {
-                       val_type = TEXTOID;
-                       if (PG_ARGISNULL(i))
-                               arg = (Datum) 0;
-                       else
-                               arg = CStringGetTextDatum(PG_GETARG_POINTER(i));
-               }
-               else
-               {
-                       arg = PG_GETARG_DATUM(i);
-               }
-               if (val_type == InvalidOid || val_type == UNKNOWNOID)
-                       ereport(ERROR,
-                                       (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                                        errmsg("arg %d: could not determine data type", i + 1)));
                appendStringInfoString(result, sep);
                sep = ", ";
-               add_json(arg, PG_ARGISNULL(i), result, val_type, false);
+               add_json(args[i], nulls[i], result, types[i], false);
        }
+
        appendStringInfoChar(result, ']');
 
        PG_RETURN_TEXT_P(cstring_to_text_with_len(result->data, result->len));
-
 }
 
 /*
@@ -2109,9 +2302,8 @@ json_build_array_noargs(PG_FUNCTION_ARGS)
 /*
  * SQL function json_object(text[])
  *
- * take a one or two dimensional array of text as name vale pairs
+ * take a one or two dimensional array of text as key/value pairs
  * for a json object.
- *
  */
 Datum
 json_object(PG_FUNCTION_ARGS)
@@ -2171,10 +2363,6 @@ json_object(PG_FUNCTION_ARGS)
                                         errmsg("null value not allowed for object key")));
 
                v = TextDatumGetCString(in_datums[i * 2]);
-               if (v[0] == '\0')
-                       ereport(ERROR,
-                                       (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
-                                        errmsg("empty value not allowed for object key")));
                if (i > 0)
                        appendStringInfoString(&result, ", ");
                escape_json(&result, v);
@@ -2205,7 +2393,7 @@ json_object(PG_FUNCTION_ARGS)
 /*
  * SQL function json_object(text[], text[])
  *
- * take separate name and value arrays of text to construct a json object
+ * take separate key and value arrays of text to construct a json object
  * pairwise.
  */
 Datum
@@ -2259,10 +2447,6 @@ json_object_two_arg(PG_FUNCTION_ARGS)
                                         errmsg("null value not allowed for object key")));
 
                v = TextDatumGetCString(key_datums[i]);
-               if (v[0] == '\0')
-                       ereport(ERROR,
-                                       (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
-                                        errmsg("empty value not allowed for object key")));
                if (i > 0)
                        appendStringInfoString(&result, ", ");
                escape_json(&result, v);
@@ -2289,7 +2473,6 @@ json_object_two_arg(PG_FUNCTION_ARGS)
        pfree(result.data);
 
        PG_RETURN_TEXT_P(rval);
-
 }
 
 
@@ -2301,7 +2484,7 @@ escape_json(StringInfo buf, const char *str)
 {
        const char *p;
 
-       appendStringInfoCharMacro(buf, '\"');
+       appendStringInfoCharMacro(buf, '"');
        for (p = str; *p; p++)
        {
                switch (*p)
@@ -2335,7 +2518,7 @@ escape_json(StringInfo buf, const char *str)
                                break;
                }
        }
-       appendStringInfoCharMacro(buf, '\"');
+       appendStringInfoCharMacro(buf, '"');
 }
 
 /*
@@ -2359,7 +2542,7 @@ json_typeof(PG_FUNCTION_ARGS)
        JsonTokenType tok;
        char       *type;
 
-       json = PG_GETARG_TEXT_P(0);
+       json = PG_GETARG_TEXT_PP(0);
        lex = makeJsonLexContext(json, false);
 
        /* Lex exactly one token from the input and check its type. */