Fix json_/jsonb_ prefix in error messages

Nikita Glukhov · Nikita Glukhov · commit 537da8a6d14c · 2020-11-24T18:49:53.000+03:00
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
@@ -13,6 +13,7 @@
  */
 
 #define JSON_C
+#define JSONB "json"
 
 #define JSONXOID					JSONOID
 
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
@@ -1177,7 +1177,7 @@ jsonb_build_object(PG_FUNCTION_ARGS)
 				 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.",
-						 "jsonb_build_object()")));
+						 JSONB"_build_object()")));
 
 	memset(&result, 0, sizeof(JsonbInState));
 
@@ -1189,7 +1189,12 @@ jsonb_build_object(PG_FUNCTION_ARGS)
 		if (nulls[i])
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+#ifdef JSON_C
+					 errmsg("argument %d cannot be null", i + 1),
+					 errhint("Object keys should be text.")));
+#else
 					 errmsg("argument %d: key must not be null", i + 1)));
+#endif
 
 		add_jsonb(args[i], false, &result, types[i], true);
 
@@ -1488,7 +1493,7 @@ jsonb_agg_transfn(PG_FUNCTION_ARGS)
 	if (!AggCheckCallContext(fcinfo, &aggcontext))
 	{
 		/* cannot be called directly because of internal-type argument */
-		elog(ERROR, "jsonb_agg_transfn called in non-aggregate context");
+		elog(ERROR, JSONB"_agg_transfn called in non-aggregate context");
 	}
 
 	/* set up the accumulator on the first go round */
@@ -1642,7 +1647,7 @@ jsonb_object_agg_transfn(PG_FUNCTION_ARGS)
 	if (!AggCheckCallContext(fcinfo, &aggcontext))
 	{
 		/* cannot be called directly because of internal-type argument */
-		elog(ERROR, "jsonb_object_agg_transfn called in non-aggregate context");
+		elog(ERROR, JSONB"_object_agg_transfn called in non-aggregate context");
 	}
 
 	/* set up the accumulator on the first go round */
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
@@ -589,12 +589,12 @@ jsonb_object_keys(PG_FUNCTION_ARGS)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 					 errmsg("cannot call %s on a scalar",
-							"jsonb_object_keys")));
+							JSONB"_object_keys")));
 		else if (JB_ROOT_IS_ARRAY(jb))
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 					 errmsg("cannot call %s on an array",
-							"jsonb_object_keys")));
+							JSONB"_object_keys")));
 
 		funcctx = SRF_FIRSTCALL_INIT();
 		oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
@@ -1601,7 +1601,7 @@ get_jsonb_path_all(FunctionCallInfo fcinfo, bool as_text)
 				/* Container must be array, but make sure */
 
 				if (!JsonContainerIsArray(container))
-					elog(ERROR, "not a jsonb array");
+					elog(ERROR, "not a "JSONB" array");
 
 				nelements = JsonContainerSize(container) >= 0 ?
 							JsonContainerSize(container) :
@@ -1815,7 +1815,7 @@ json_each(PG_FUNCTION_ARGS)
 Datum
 jsonb_each(PG_FUNCTION_ARGS)
 {
-	return each_worker_jsonb(fcinfo, "jsonb_each", false);
+	return each_worker_jsonb(fcinfo, JSONB"_each", false);
 }
 
 #ifndef JSON_GENERIC
@@ -1829,7 +1829,7 @@ json_each_text(PG_FUNCTION_ARGS)
 Datum
 jsonb_each_text(PG_FUNCTION_ARGS)
 {
-	return each_worker_jsonb(fcinfo, "jsonb_each_text", true);
+	return each_worker_jsonb(fcinfo, JSONB"_each_text", true);
 }
 
 static Datum
@@ -1882,7 +1882,7 @@ each_worker_jsonb(FunctionCallInfo fcinfo, const char *funcname, bool as_text)
 	MemoryContextSwitchTo(old_cxt);
 
 	tmp_cxt = AllocSetContextCreate(CurrentMemoryContext,
-									"jsonb_each temporary cxt",
+									JSONB"_each temporary cxt",
 									ALLOCSET_DEFAULT_SIZES);
 
 	it = JsonbIteratorInit(JsonbRoot(jb));
@@ -2121,13 +2121,13 @@ each_scalar(void *state, char *token, JsonTokenType tokentype)
 Datum
 jsonb_array_elements(PG_FUNCTION_ARGS)
 {
-	return elements_worker_jsonb(fcinfo, "jsonb_array_elements", false);
+	return elements_worker_jsonb(fcinfo, JSONB"_array_elements", false);
 }
 
 Datum
 jsonb_array_elements_text(PG_FUNCTION_ARGS)
 {
-	return elements_worker_jsonb(fcinfo, "jsonb_array_elements_text", true);
+	return elements_worker_jsonb(fcinfo, JSONB"_array_elements_text", true);
 }
 
 static Datum
@@ -2181,7 +2181,7 @@ elements_worker_jsonb(FunctionCallInfo fcinfo, const char *funcname,
 	MemoryContextSwitchTo(old_cxt);
 
 	tmp_cxt = AllocSetContextCreate(CurrentMemoryContext,
-									"jsonb_array_elements temporary cxt",
+									JSONB"_array_elements temporary cxt",
 									ALLOCSET_DEFAULT_SIZES);
 
 	it = JsonbIteratorInit(JsonbRoot(jb));
@@ -2425,14 +2425,14 @@ elements_scalar(void *state, char *token, JsonTokenType tokentype)
 Datum
 jsonb_populate_record(PG_FUNCTION_ARGS)
 {
-	return populate_record_worker(fcinfo, "jsonb_populate_record",
+	return populate_record_worker(fcinfo, JSONB"_populate_record",
 								  JSONXOID == JSONOID, true);
 }
 
 Datum
 jsonb_to_record(PG_FUNCTION_ARGS)
 {
-	return populate_record_worker(fcinfo, "jsonb_to_record",
+	return populate_record_worker(fcinfo, JSONB"_to_record",
 								  JSONXOID == JSONOID, false);
 }
 
@@ -3673,14 +3673,14 @@ hash_scalar(void *state, char *token, JsonTokenType tokentype)
 Datum
 jsonb_populate_recordset(PG_FUNCTION_ARGS)
 {
-	return populate_recordset_worker(fcinfo, "jsonb_populate_recordset",
+	return populate_recordset_worker(fcinfo, JSONB"_populate_recordset",
 									 false, true);
 }
 
 Datum
 jsonb_to_recordset(PG_FUNCTION_ARGS)
 {
-	return populate_recordset_worker(fcinfo, "jsonb_to_recordset",
+	return populate_recordset_worker(fcinfo, JSONB"_to_recordset",
 									 false, false);
 }
 
@@ -4883,7 +4883,7 @@ IteratorConcat(JsonbIterator **it1, JsonbIterator **it2,
 		 */
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("invalid concatenation of jsonb objects")));
+				 errmsg("invalid concatenation of "JSONB" objects")));
 	}
 
 	return res;
@@ -4986,7 +4986,7 @@ setPathObject(JsonbIterator **it, Datum *path_elems, bool *path_nulls,
 					ereport(ERROR,
 							(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 							 errmsg("cannot replace existing key"),
-							 errhint("Try using the function jsonb_set "
+							 errhint("Try using the function "JSONB"_set "
 									 "to replace key value.")));
 
 				r = JsonbIteratorNext(it, &v, true);	/* skip value */
diff --git a/src/include/utils/jsonb.h b/src/include/utils/jsonb.h
@@ -16,6 +16,10 @@
 #include "utils/array.h"
 #include "utils/numeric.h"
 
+#ifndef JSONB
+#define JSONB "jsonb"
+#endif
+
 /* Tokens used when sequentially processing a jsonb value */
 typedef enum
 {
