From beb4699091e9fab1c5f465056bef35c9ddf7f9fc Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Wed, 29 Jan 2020 10:19:24 -0500 Subject: Move jsonapi.c and jsonapi.h to src/common. To make this work, (1) makeJsonLexContextCstringLen now takes the encoding to be used as an argument; (2) check_stack_depth() is made to do nothing in frontend code, and (3) elog(ERROR, ...) is changed to pg_log_fatal + exit in frontend code. Mark Dilger, reviewed and slightly revised by me. Discussion: http://postgr.es/m/CA+TgmoYfOXhd27MUDGioVh6QtpD0C1K-f6ObSA10AWiHBAL5bA@mail.gmail.com --- src/backend/utils/adt/jsonb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/backend/utils/adt/jsonb.c') diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c index c912f8932df..fea43359515 100644 --- a/src/backend/utils/adt/jsonb.c +++ b/src/backend/utils/adt/jsonb.c @@ -261,7 +261,7 @@ jsonb_from_cstring(char *json, int len) memset(&state, 0, sizeof(state)); memset(&sem, 0, sizeof(sem)); - lex = makeJsonLexContextCstringLen(json, len, true); + lex = makeJsonLexContextCstringLen(json, len, GetDatabaseEncoding(), true); sem.semstate = (void *) &state; -- cgit v1.2.3