Skip to content

Change json_object name to avoid conflict with jansson lib. #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
my-ship-it merged 1 commit into from
Aug 31, 2023
Merged

Change json_object name to avoid conflict with jansson lib. #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/backend/utils/adt/json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/include/catalog/pg_proc.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' },
Expand Down