aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/adt/json.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils/adt/json.c')
-rw-r--r--src/backend/utils/adt/json.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
index c52f6732b05..6f678eb8b22 100644
--- a/src/backend/utils/adt/json.c
+++ b/src/backend/utils/adt/json.c
@@ -1342,6 +1342,9 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
bool numeric_error;
JsonLexContext dummy_lex;
+ /* callers are expected to ensure that null keys are not passed in */
+ Assert( ! (key_scalar && is_null));
+
if (is_null)
{
appendStringInfoString(result, "null");
@@ -1487,10 +1490,6 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
break;
default:
outputstr = OidOutputFunctionCall(outfuncoid, val);
- if (key_scalar && *outputstr == '\0')
- ereport(ERROR,
- (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
- errmsg("key value must not be empty")));
escape_json(result, outputstr);
pfree(outputstr);
break;