Further tweaking of jsonb_set_lax().

tglsfdc · tglsfdc · commit 31f403e95fdf · 2020-01-20T14:26:56.000-05:00
Some buildfarm members were still warning about this, because in 9c679a0 I'd missed decorating one of the ereport() code paths with a dummy return. Also, adjust the error messages to be more in line with project style guide.
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
@@ -4415,7 +4415,7 @@ jsonb_set_lax(PG_FUNCTION_ARGS)
 	if (PG_ARGISNULL(4))
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("need delete_key, return_target, use_json_null, or raise_exception")));
+				 errmsg("null_value_treatment must be \"delete_key\", \"return_target\", \"use_json_null\", or \"raise_exception\"")));
 
 	/* if the new value isn't an SQL NULL just call jsonb_set */
 	if (! PG_ARGISNULL(2))
@@ -4428,9 +4428,10 @@ jsonb_set_lax(PG_FUNCTION_ARGS)
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
-				 errmsg("NULL is not allowed"),
-				 errdetail("exception raised due to \"null_value_treatment => 'raise_exception'\""),
-				 errhint("to avoid, either change the null_value_treatment argument or ensure that an SQL NULL is not used")));
+				 errmsg("JSON value must not be null"),
+				 errdetail("Exception was raised because null_value_treatment is \"raise_exception\"."),
+				 errhint("To avoid, either change the null_value_treatment argument or ensure that an SQL NULL is not passed.")));
+		return (Datum) 0;		/* silence stupider compilers */
 	}
 	else if (strcmp(handle_val, "use_json_null") == 0)
 	{
@@ -4455,7 +4456,7 @@ jsonb_set_lax(PG_FUNCTION_ARGS)
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("need delete_key, return_target, use_json_null, or raise_exception")));
+				 errmsg("null_value_treatment must be \"delete_key\", \"return_target\", \"use_json_null\", or \"raise_exception\"")));
 		return (Datum) 0;		/* silence stupider compilers */
 	}
 }
diff --git a/src/test/regress/expected/jsonb.out b/src/test/regress/expected/jsonb.out
@@ -4541,14 +4541,14 @@ select jsonb_set_lax('{"a":1,"b":2}','{d}',null,true);
 
 -- errors
 select jsonb_set_lax('{"a":1,"b":2}', '{b}', null, true, null);
-ERROR:  need delete_key, return_target, use_json_null, or raise_exception
+ERROR:  null_value_treatment must be "delete_key", "return_target", "use_json_null", or "raise_exception"
 select jsonb_set_lax('{"a":1,"b":2}', '{b}', null, true, 'no_such_treatment');
-ERROR:  need delete_key, return_target, use_json_null, or raise_exception
+ERROR:  null_value_treatment must be "delete_key", "return_target", "use_json_null", or "raise_exception"
 -- explicit treatments
 select jsonb_set_lax('{"a":1,"b":2}', '{b}', null, null_value_treatment => 'raise_exception') as raise_exception;
-ERROR:  NULL is not allowed
-DETAIL:  exception raised due to "null_value_treatment => 'raise_exception'"
-HINT:  to avoid, either change the null_value_treatment argument or ensure that an SQL NULL is not used
+ERROR:  JSON value must not be null
+DETAIL:  Exception was raised because null_value_treatment is "raise_exception".
+HINT:  To avoid, either change the null_value_treatment argument or ensure that an SQL NULL is not passed.
 select jsonb_set_lax('{"a":1,"b":2}', '{b}', null, null_value_treatment => 'return_target') as return_target;
   return_target   
 ------------------

Original file line number	Diff line number	Diff line change
`@@ -4415,7 +4415,7 @@ jsonb_set_lax(PG_FUNCTION_ARGS)`
`4415`	`4415`	`if (PG_ARGISNULL(4))`
`4416`	`4416`	`ereport(ERROR,`
`4417`	`4417`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`4418`		`- errmsg("need delete_key, return_target, use_json_null, or raise_exception")));`
	`4418`	`+ errmsg("null_value_treatment must be \"delete_key\", \"return_target\", \"use_json_null\", or \"raise_exception\"")));`
`4419`	`4419`
`4420`	`4420`	`/* if the new value isn't an SQL NULL just call jsonb_set */`
`4421`	`4421`	`if (! PG_ARGISNULL(2))`
`@@ -4428,9 +4428,10 @@ jsonb_set_lax(PG_FUNCTION_ARGS)`
`4428`	`4428`	`{`
`4429`	`4429`	`ereport(ERROR,`
`4430`	`4430`	`(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),`
`4431`		`- errmsg("NULL is not allowed"),`
`4432`		`- errdetail("exception raised due to \"null_value_treatment => 'raise_exception'\""),`
`4433`		`- errhint("to avoid, either change the null_value_treatment argument or ensure that an SQL NULL is not used")));`
	`4431`	`+ errmsg("JSON value must not be null"),`
	`4432`	`+ errdetail("Exception was raised because null_value_treatment is \"raise_exception\"."),`
	`4433`	`+ errhint("To avoid, either change the null_value_treatment argument or ensure that an SQL NULL is not passed.")));`
	`4434`	`+ return (Datum) 0; /* silence stupider compilers */`
`4434`	`4435`	`}`
`4435`	`4436`	`else if (strcmp(handle_val, "use_json_null") == 0)`
`4436`	`4437`	`{`
`@@ -4455,7 +4456,7 @@ jsonb_set_lax(PG_FUNCTION_ARGS)`
`4455`	`4456`	`{`
`4456`	`4457`	`ereport(ERROR,`
`4457`	`4458`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`4458`		`- errmsg("need delete_key, return_target, use_json_null, or raise_exception")));`
	`4459`	`+ errmsg("null_value_treatment must be \"delete_key\", \"return_target\", \"use_json_null\", or \"raise_exception\"")));`
`4459`	`4460`	`return (Datum) 0; /* silence stupider compilers */`
`4460`	`4461`	`}`
`4461`	`4462`	`}`