From 9b1dae695fe10dd996e0b463dfbf3ed6de2c4bdf Mon Sep 17 00:00:00 2001 From: liuxiaoyu Date: Thu, 17 Aug 2023 14:34:52 +0800 Subject: [PATCH] Change json_object name to avoid conflict with jansson lib. --- src/backend/utils/adt/json.c | 2 +- src/include/catalog/pg_proc.dat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c index 30ca2cf6c81..c29c8b7a1c7 100644 --- a/src/backend/utils/adt/json.c +++ b/src/backend/utils/adt/json.c @@ -1102,7 +1102,7 @@ json_build_array_noargs(PG_FUNCTION_ARGS) * for a json object. */ Datum -json_object(PG_FUNCTION_ARGS) +pg_json_object(PG_FUNCTION_ARGS) { ArrayType *in_array = PG_GETARG_ARRAYTYPE_P(0); int ndims = ARR_NDIM(in_array); diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat index bd4a20242c4..e72142f0af7 100644 --- a/src/include/catalog/pg_proc.dat +++ b/src/include/catalog/pg_proc.dat @@ -8770,7 +8770,7 @@ prosrc => 'json_build_object_noargs' }, { oid => '3202', descr => 'map text array of key value pairs to json object', proname => 'json_object', prorettype => 'json', proargtypes => '_text', - prosrc => 'json_object' }, + prosrc => 'pg_json_object' }, { oid => '3203', descr => 'map text arrays of keys and values to json object', proname => 'json_object', prorettype => 'json', proargtypes => '_text _text', prosrc => 'json_object_two_arg' },