postgrespro
diff --git a/‎src/backend/utils/adt/json.c
Lines changed: 0 additions & 31 deletions b/‎src/backend/utils/adt/json.c
Lines changed: 0 additions & 31 deletions
diff --git a/‎src/backend/utils/adt/jsonbsubs.c
Lines changed: 33 additions & 10 deletions b/‎src/backend/utils/adt/jsonbsubs.c
Lines changed: 33 additions & 10 deletions
@@ -35,36 +35,6 @@
 #define jsonb_object_two_arg		json_object_two_arg
 #define jsonb_typeof				json_typeof
 
-#define jsonb_array_element			json_array_element
-#define jsonb_array_element_text	json_array_element_text
-#define jsonb_array_elements		json_array_elements
-#define jsonb_array_elements_text	json_array_elements_text
-#define jsonb_array_length			json_array_length
-#define jsonb_canonical				json_canonical
-#define jsonb_concat				json_concat
-#define jsonb_delete				json_delete
-#define jsonb_delete_idx			json_delete_idx
-#define jsonb_delete_path			json_delete_path
-#define jsonb_delete_array			json_delete_array
-#define jsonb_each					json_each
-#define jsonb_each_text				json_each_text
-#define jsonb_insert				json_insert
-#define jsonb_extract_path			json_extract_path
-#define jsonb_extract_path_text		json_extract_path_text
-#define jsonb_object_field			json_object_field
-#define jsonb_object_field_text		json_object_field_text
-#define jsonb_object_keys			json_object_keys
-#define jsonb_extract_keys			json_extract_keys
-#define jsonb_populate_record		json_populate_record
-#define jsonb_populate_recordset	json_populate_recordset
-#define jsonb_pretty				json_pretty
-#define jsonb_set					json_set
-#define jsonb_set_lax				json_set_lax
-#define jsonb_to_record				json_to_record
-#define jsonb_to_recordset			json_to_recordset
-#define jsonb_get_element			json_get_element
-#define jsonb_set_element			json_set_element
-
 #define JsonxContainerOps			(&jsontContainerOps)
 #define JsonxGetUniquified(json)	(json)
 #define JsonxPGetDatum(json)		JsontPGetDatum(json)
@@ -291,7 +261,6 @@ escape_json(StringInfo buf, const char *str)
 }
 
 #include "jsonb.c"
-#include "jsonfuncs.c"
 
 /*
  * SQL function array_to_json(row)
 
@@ -244,16 +244,29 @@ jsonb_subscript_fetch(ExprState *state,
 	SubscriptingRefState *sbsrefstate = op->d.sbsref.state;
 	JsonbSubWorkspace *workspace = (JsonbSubWorkspace *) sbsrefstate->workspace;
 	Jsonb	   *jsonbSource;
+	JsonbValue *res;
+	JsonbValue	resbuf;
 
 	/* Should not get here if source jsonb (or any subscript) is null */
 	Assert(!(*op->resnull));
 
 	jsonbSource = DatumGetJsonbP(*op->resvalue);
-	*op->resvalue = jsonb_get_element(jsonbSource,
-									  workspace->index,
-									  sbsrefstate->numupper,
-									  op->resnull,
-									  false);
+
+	res = jsonb_get_element(jsonbSource,
+							workspace->index,
+							sbsrefstate->numupper,
+							&resbuf);
+
+	if (res != NULL)
+	{
+		*op->resnull = false;
+		*op->resvalue = JsonbPGetDatum(JsonbValueToJsonb(res));
+	}
+	else
+	{
+		*op->resnull = true;
+		*op->resvalue = PointerGetDatum(NULL);
+	}
 }
 
 /*
@@ -340,12 +353,22 @@ jsonb_subscript_fetch_old(ExprState *state,
 	else
 	{
 		Jsonb	   *jsonbSource = DatumGetJsonbP(*op->resvalue);
+		JsonbValue	resbuf;
+		JsonbValue *res = jsonb_get_element(jsonbSource,
+											sbsrefstate->upperindex,
+											sbsrefstate->numupper,
+											&resbuf);
 
-		sbsrefstate->prevvalue = jsonb_get_element(jsonbSource,
-												   sbsrefstate->upperindex,
-												   sbsrefstate->numupper,
-												   &sbsrefstate->prevnull,
-												   false);
+		if (res != NULL)
+		{
+			sbsrefstate->prevnull = false;
+			sbsrefstate->prevvalue = JsonbPGetDatum(JsonbValueToJsonb(res));
+		}
+		else
+		{
+			sbsrefstate->prevnull = true;
+			sbsrefstate->prevvalue = PointerGetDatum(NULL);
+		}
 	}
 }