open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove excess parens in ereport() calls

Browse Source 
Cosmetic cleanup, not worth backpatching.

Discussion: https://postgr.es/m/20200129200401.GA6303@alvherre.pgsql
Reviewed-by: Tom Lane, Michael Paquier
pull/49/head
Alvaro Herrera 6 years ago
parent 2520cf8c2a
commit 4e89c79a52
37 changed files with 97 additions and 97 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      contrib/adminpack/adminpack.c
  2. 2
      contrib/hstore_plperl/hstore_plperl.c
  3. 6
      contrib/jsonb_plperl/jsonb_plperl.c
  4. 8
      contrib/jsonb_plpython/jsonb_plpython.c
  5. 8
      contrib/pageinspect/brinfuncs.c
  6. 8
      contrib/pageinspect/btreefuncs.c
  7. 2
      contrib/pageinspect/fsmfuncs.c
  8. 6
      contrib/pageinspect/ginfuncs.c
  9. 10
      contrib/pageinspect/hashfuncs.c
  10. 2
      contrib/pageinspect/heapfuncs.c
  11. 6
      contrib/pageinspect/rawpage.c
  12. 4
      contrib/pg_prewarm/pg_prewarm.c
  13. 2
      contrib/pgstattuple/pgstatapprox.c
  14. 10
      contrib/pgstattuple/pgstatindex.c
  15. 4
      contrib/pgstattuple/pgstattuple.c
  16. 4
      src/backend/access/transam/xlogfuncs.c
  17. 8
      src/backend/commands/alter.c
  18. 2
      src/backend/commands/collationcmds.c
  19. 2
      src/backend/commands/createas.c
  20. 4
      src/backend/commands/functioncmds.c
  21. 2
      src/backend/commands/publicationcmds.c
  22. 2
      src/backend/commands/subscriptioncmds.c
  23. 4
      src/backend/commands/user.c
  24. 8
      src/backend/libpq/auth-scram.c
  25. 6
      src/backend/libpq/be-secure-openssl.c
  26. 4
      src/backend/postmaster/syslogger.c
  27. 6
      src/backend/replication/logical/logical.c
  28. 2
      src/backend/replication/logical/logicalfuncs.c
  29. 4
      src/backend/replication/repl_gram.y
  30. 2
      src/backend/replication/slot.c
  31. 4
      src/backend/replication/slotfuncs.c
  32. 6
      src/backend/replication/walsender.c
  33. 4
      src/backend/storage/ipc/procarray.c
  34. 14
      src/backend/storage/ipc/signalfuncs.c
  35. 12
      src/backend/utils/adt/genfile.c
  36. 2
      src/backend/utils/adt/pg_upgrade_support.c
  37. 2
      src/backend/utils/misc/guc.c

12
contrib/adminpack/adminpack.c
Unescape View File

@ -93,7 +93,7 @@ convert_and_check_filename(text *arg, bool logAllowed)
if (path_contains_parent_reference(filename))
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("reference to parent directory (\"..\") not allowed"))));
errmsg("reference to parent directory (\"..\") not allowed")));
/*
* Allow absolute paths if within DataDir or Log_directory, even
@ -104,12 +104,12 @@ convert_and_check_filename(text *arg, bool logAllowed)
!path_is_prefix_of_path(Log_directory, filename)))
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("absolute path not allowed"))));
errmsg("absolute path not allowed")));
}
else if (!path_is_relative_and_below_cwd(filename))
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("path must be in or below the current directory"))));
errmsg("path must be in or below the current directory")));
return filename;
}
@ -124,7 +124,7 @@ requireSuperuser(void)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("only superuser may access generic file functions"))));
errmsg("only superuser may access generic file functions")));
}
@ -485,7 +485,7 @@ pg_logdir_ls(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("only superuser can list the log directory"))));
errmsg("only superuser can list the log directory")));
return (pg_logdir_ls_internal(fcinfo));
}
@ -515,7 +515,7 @@ pg_logdir_ls_internal(FunctionCallInfo fcinfo)
if (strcmp(Log_filename, "postgresql-%Y-%m-%d_%H%M%S.log") != 0)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
(errmsg("the log_filename parameter must equal 'postgresql-%%Y-%%m-%%d_%%H%%M%%S.log'"))));
errmsg("the log_filename parameter must equal 'postgresql-%%Y-%%m-%%d_%%H%%M%%S.log'")));
if (SRF_IS_FIRSTCALL())
{

2
contrib/hstore_plperl/hstore_plperl.c
Unescape View File

@ -116,7 +116,7 @@ plperl_to_hstore(PG_FUNCTION_ARGS)
if (SvTYPE(in) != SVt_PVHV)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
(errmsg("cannot transform non-hash Perl value to hstore"))));
errmsg("cannot transform non-hash Perl value to hstore")));
hv = (HV *) in;
pcount = hv_iterinit(hv);

6
contrib/jsonb_plperl/jsonb_plperl.c
Unescape View File

@ -235,11 +235,11 @@ SV_to_JsonbValue(SV *in, JsonbParseState **jsonb_state, bool is_elem)
if (isinf(nval))
ereport(ERROR,
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
(errmsg("cannot convert infinity to jsonb"))));
errmsg("cannot convert infinity to jsonb")));
if (isnan(nval))
ereport(ERROR,
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
(errmsg("cannot convert NaN to jsonb"))));
errmsg("cannot convert NaN to jsonb")));
out.type = jbvNumeric;
out.val.numeric =
@ -260,7 +260,7 @@ SV_to_JsonbValue(SV *in, JsonbParseState **jsonb_state, bool is_elem)
*/
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
(errmsg("cannot transform this Perl type to jsonb"))));
errmsg("cannot transform this Perl type to jsonb")));
return NULL;
}
}

8
contrib/jsonb_plpython/jsonb_plpython.c
Unescape View File

@ -380,7 +380,7 @@ PLyNumber_ToJsonbValue(PyObject *obj, JsonbValue *jbvNum)
{
ereport(ERROR,
(errcode(ERRCODE_DATATYPE_MISMATCH),
(errmsg("could not convert value \"%s\" to jsonb", str))));
errmsg("could not convert value \"%s\" to jsonb", str)));
}
PG_END_TRY();
@ -394,7 +394,7 @@ PLyNumber_ToJsonbValue(PyObject *obj, JsonbValue *jbvNum)
if (numeric_is_nan(num))
ereport(ERROR,
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
(errmsg("cannot convert NaN to jsonb"))));
errmsg("cannot convert NaN to jsonb")));
jbvNum->type = jbvNumeric;
jbvNum->val.numeric = num;
@ -446,8 +446,8 @@ PLyObject_ToJsonbValue(PyObject *obj, JsonbParseState **jsonb_state, bool is_ele
else
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
(errmsg("Python type \"%s\" cannot be transformed to jsonb",
PLyObject_AsString((PyObject *) obj->ob_type)))));
errmsg("Python type \"%s\" cannot be transformed to jsonb",
PLyObject_AsString((PyObject *) obj->ob_type))));
/* Push result into 'jsonb_state' unless it is raw scalar value. */
return (*jsonb_state ?

8
contrib/pageinspect/brinfuncs.c
Unescape View File

@ -52,7 +52,7 @@ brin_page_type(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use raw page functions"))));
errmsg("must be superuser to use raw page functions")));
raw_page_size = VARSIZE(raw_page) - VARHDRSZ;
@ -141,7 +141,7 @@ brin_page_items(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use raw page functions"))));
errmsg("must be superuser to use raw page functions")));
/* check to see if caller supports us returning a tuplestore */
if (rsinfo == NULL || !IsA(rsinfo, ReturnSetInfo))
@ -336,7 +336,7 @@ brin_metapage_info(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use raw page functions"))));
errmsg("must be superuser to use raw page functions")));
page = verify_brin_page(raw_page, BRIN_PAGETYPE_META, "metapage");
@ -374,7 +374,7 @@ brin_revmap_data(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use raw page functions"))));
errmsg("must be superuser to use raw page functions")));
if (SRF_IS_FIRSTCALL())
{

8
contrib/pageinspect/btreefuncs.c
Unescape View File

@ -174,7 +174,7 @@ bt_page_stats(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use pageinspect functions"))));
errmsg("must be superuser to use pageinspect functions")));
relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
rel = relation_openrv(relrv, AccessShareLock);
@ -318,7 +318,7 @@ bt_page_items(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use pageinspect functions"))));
errmsg("must be superuser to use pageinspect functions")));
if (SRF_IS_FIRSTCALL())
{
@ -428,7 +428,7 @@ bt_page_items_bytea(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use raw page functions"))));
errmsg("must be superuser to use raw page functions")));
if (SRF_IS_FIRSTCALL())
{
@ -518,7 +518,7 @@ bt_metap(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use pageinspect functions"))));
errmsg("must be superuser to use pageinspect functions")));
relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
rel = relation_openrv(relrv, AccessShareLock);

2
contrib/pageinspect/fsmfuncs.c
Unescape View File

@ -42,7 +42,7 @@ fsm_page_contents(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use raw page functions"))));
errmsg("must be superuser to use raw page functions")));
fsmpage = (FSMPage) PageGetContents(VARDATA(raw_page));

6
contrib/pageinspect/ginfuncs.c
Unescape View File

@ -45,7 +45,7 @@ gin_metapage_info(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use raw page functions"))));
errmsg("must be superuser to use raw page functions")));
page = get_page_from_raw(raw_page);
@ -103,7 +103,7 @@ gin_page_opaque_info(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use raw page functions"))));
errmsg("must be superuser to use raw page functions")));
page = get_page_from_raw(raw_page);
@ -169,7 +169,7 @@ gin_leafpage_items(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use raw page functions"))));
errmsg("must be superuser to use raw page functions")));
if (SRF_IS_FIRSTCALL())
{

10
contrib/pageinspect/hashfuncs.c
Unescape View File

@ -195,7 +195,7 @@ hash_page_type(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use raw page functions"))));
errmsg("must be superuser to use raw page functions")));
page = verify_hash_page(raw_page, 0);
@ -243,7 +243,7 @@ hash_page_stats(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use raw page functions"))));
errmsg("must be superuser to use raw page functions")));
page = verify_hash_page(raw_page, LH_BUCKET_PAGE | LH_OVERFLOW_PAGE);
@ -310,7 +310,7 @@ hash_page_items(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use raw page functions"))));
errmsg("must be superuser to use raw page functions")));
if (SRF_IS_FIRSTCALL())
{
@ -415,7 +415,7 @@ hash_bitmap_info(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use raw page functions"))));
errmsg("must be superuser to use raw page functions")));
indexRel = index_open(indexRelid, AccessShareLock);
@ -526,7 +526,7 @@ hash_metapage_info(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use raw page functions"))));
errmsg("must be superuser to use raw page functions")));
page = verify_hash_page(raw_page, LH_META_PAGE);

2
contrib/pageinspect/heapfuncs.c
Unescape View File

@ -135,7 +135,7 @@ heap_page_items(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use raw page functions"))));
errmsg("must be superuser to use raw page functions")));
raw_page_size = VARSIZE(raw_page) - VARHDRSZ;

6
contrib/pageinspect/rawpage.c
Unescape View File

@ -102,7 +102,7 @@ get_raw_page_internal(text *relname, ForkNumber forknum, BlockNumber blkno)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use raw page functions"))));
errmsg("must be superuser to use raw page functions")));
relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
rel = relation_openrv(relrv, AccessShareLock);
@ -233,7 +233,7 @@ page_header(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use raw page functions"))));
errmsg("must be superuser to use raw page functions")));
raw_page_size = VARSIZE(raw_page) - VARHDRSZ;
@ -305,7 +305,7 @@ page_checksum(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use raw page functions"))));
errmsg("must be superuser to use raw page functions")));
raw_page_size = VARSIZE(raw_page) - VARHDRSZ;

4
contrib/pg_prewarm/pg_prewarm.c
Unescape View File

@ -77,7 +77,7 @@ pg_prewarm(PG_FUNCTION_ARGS)
if (PG_ARGISNULL(1))
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
(errmsg("prewarm type cannot be null"))));
errmsg("prewarm type cannot be null")));
type = PG_GETARG_TEXT_PP(1);
ttype = text_to_cstring(type);
if (strcmp(ttype, "prefetch") == 0)
@ -97,7 +97,7 @@ pg_prewarm(PG_FUNCTION_ARGS)
if (PG_ARGISNULL(2))
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
(errmsg("relation fork cannot be null"))));
errmsg("relation fork cannot be null")));
forkName = PG_GETARG_TEXT_PP(2);
forkString = text_to_cstring(forkName);
forkNumber = forkname_to_number(forkString);

2
contrib/pgstattuple/pgstatapprox.c
Unescape View File

@ -228,7 +228,7 @@ pgstattuple_approx(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use pgstattuple functions"))));
errmsg("must be superuser to use pgstattuple functions")));
PG_RETURN_DATUM(pgstattuple_approx_internal(relid, fcinfo));
}

10
contrib/pgstattuple/pgstatindex.c
Unescape View File

@ -151,7 +151,7 @@ pgstatindex(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use pgstattuple functions"))));
errmsg("must be superuser to use pgstattuple functions")));
relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
rel = relation_openrv(relrv, AccessShareLock);
@ -193,7 +193,7 @@ pgstatindexbyid(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use pgstattuple functions"))));
errmsg("must be superuser to use pgstattuple functions")));
rel = relation_open(relid, AccessShareLock);
@ -386,7 +386,7 @@ pg_relpages(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use pgstattuple functions"))));
errmsg("must be superuser to use pgstattuple functions")));
relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
rel = relation_openrv(relrv, AccessShareLock);
@ -438,7 +438,7 @@ pg_relpagesbyid(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use pgstattuple functions"))));
errmsg("must be superuser to use pgstattuple functions")));
rel = relation_open(relid, AccessShareLock);
@ -492,7 +492,7 @@ pgstatginindex(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use pgstattuple functions"))));
errmsg("must be superuser to use pgstattuple functions")));
PG_RETURN_DATUM(pgstatginindex_internal(relid, fcinfo));
}

4
contrib/pgstattuple/pgstattuple.c
Unescape View File

@ -173,7 +173,7 @@ pgstattuple(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use pgstattuple functions"))));
errmsg("must be superuser to use pgstattuple functions")));
/* open relation */
relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
@ -213,7 +213,7 @@ pgstattuplebyid(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to use pgstattuple functions"))));
errmsg("must be superuser to use pgstattuple functions")));
/* open relation */
rel = relation_open(relid, AccessShareLock);

4
src/backend/access/transam/xlogfuncs.c
Unescape View File

@ -298,8 +298,8 @@ pg_create_restore_point(PG_FUNCTION_ARGS)
if (RecoveryInProgress())
ereport(ERROR,
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
(errmsg("recovery is in progress"),
errhint("WAL control functions cannot be executed during recovery."))));
errmsg("recovery is in progress"),
errhint("WAL control functions cannot be executed during recovery.")));
if (!XLogIsNeeded())
ereport(ERROR,

8
src/backend/commands/alter.c
Unescape View File

@ -212,8 +212,8 @@ AlterObjectRename_internal(Relation rel, Oid objectId, const char *new_name)
if (Anum_owner <= 0)
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to rename %s",
getObjectDescriptionOids(classId, objectId)))));
errmsg("must be superuser to rename %s",
getObjectDescriptionOids(classId, objectId))));
/* Otherwise, must be owner of the existing object */
datum = heap_getattr(oldtup, Anum_owner,
@ -715,8 +715,8 @@ AlterObjectNamespace_internal(Relation rel, Oid objid, Oid nspOid)
if (Anum_owner <= 0)
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to set schema of %s",
getObjectDescriptionOids(classId, objid)))));
errmsg("must be superuser to set schema of %s",
getObjectDescriptionOids(classId, objid))));
/* Otherwise, must be owner of the existing object */
owner = heap_getattr(tup, Anum_owner, RelationGetDescr(rel), &isnull);

2
src/backend/commands/collationcmds.c
Unescape View File

@ -527,7 +527,7 @@ pg_import_system_collations(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to import system collations"))));
errmsg("must be superuser to import system collations")));
/* Load collations known to libc, using "locale -a" to enumerate them */
#ifdef READ_LOCALE_A_OUTPUT

2
src/backend/commands/createas.c
Unescape View File

@ -537,7 +537,7 @@ intorel_startup(DestReceiver *self, int operation, TupleDesc typeinfo)
if (check_enable_rls(intoRelationAddr.objectId, InvalidOid, false) == RLS_ENABLED)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
(errmsg("policies not yet implemented for this command"))));
errmsg("policies not yet implemented for this command")));
/*
* Tentatively mark the target as populated, if it's a matview and we're

4
src/backend/commands/functioncmds.c
Unescape View File

@ -286,8 +286,8 @@ interpret_function_parameter_list(ParseState *pstate,
if (fp->mode == FUNC_PARAM_OUT)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
(errmsg("procedures cannot have OUT arguments"),
errhint("INOUT arguments are permitted."))));
errmsg("procedures cannot have OUT arguments"),
errhint("INOUT arguments are permitted.")));
}
/* handle input parameters */

2
src/backend/commands/publicationcmds.c
Unescape View File

@ -158,7 +158,7 @@ CreatePublication(CreatePublicationStmt *stmt)
if (stmt->for_all_tables && !superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to create FOR ALL TABLES publication"))));
errmsg("must be superuser to create FOR ALL TABLES publication")));
rel = table_open(PublicationRelationId, RowExclusiveLock);

2
src/backend/commands/subscriptioncmds.c
Unescape View File

@ -347,7 +347,7 @@ CreateSubscription(CreateSubscriptionStmt *stmt, bool isTopLevel)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to create subscriptions"))));
errmsg("must be superuser to create subscriptions")));
/*
* If built with appropriate switch, whine when regression-testing

4
src/backend/commands/user.c
Unescape View File

@ -1523,8 +1523,8 @@ AddRoleMems(const char *rolename, Oid roleid,
if (is_member_of_role_nosuper(roleid, memberid))
ereport(ERROR,
(errcode(ERRCODE_INVALID_GRANT_OPERATION),
(errmsg("role \"%s\" is a member of role \"%s\"",
rolename, get_rolespec_name(memberRole)))));
errmsg("role \"%s\" is a member of role \"%s\"",
rolename, get_rolespec_name(memberRole))));
/*
* Check if entry for this role/member already exists; if so, give

8
src/backend/libpq/auth-scram.c
Unescape View File

@ -997,8 +997,8 @@ read_client_first_message(scram_state *state, const char *input)
if (strcmp(channel_binding_type, "tls-server-end-point") != 0)
ereport(ERROR,
(errcode(ERRCODE_PROTOCOL_VIOLATION),
(errmsg("unsupported SCRAM channel-binding type \"%s\"",
sanitize_str(channel_binding_type)))));
errmsg("unsupported SCRAM channel-binding type \"%s\"",
sanitize_str(channel_binding_type))));
break;
default:
ereport(ERROR,
@ -1282,7 +1282,7 @@ read_client_final_message(scram_state *state, const char *input)
if (strcmp(channel_binding, b64_message) != 0)
ereport(ERROR,
(errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
(errmsg("SCRAM channel binding check failed"))));
errmsg("SCRAM channel binding check failed")));
#else
/* shouldn't happen, because we checked this earlier already */
elog(ERROR, "channel binding not supported by this build");
@ -1300,7 +1300,7 @@ read_client_final_message(scram_state *state, const char *input)
!(strcmp(channel_binding, "eSws") == 0 && state->cbind_flag == 'y'))
ereport(ERROR,
(errcode(ERRCODE_PROTOCOL_VIOLATION),
(errmsg("unexpected SCRAM channel-binding attribute in client-final-message"))));
errmsg("unexpected SCRAM channel-binding attribute in client-final-message")));
}
state->client_final_nonce = read_attr_value(&p, 'r');

6
src/backend/libpq/be-secure-openssl.c
Unescape View File

@ -999,7 +999,7 @@ initialize_dh(SSL_CTX *context, bool isServerStart)
{
ereport(isServerStart ? FATAL : LOG,
(errcode(ERRCODE_CONFIG_FILE_ERROR),
(errmsg("DH: could not load DH parameters"))));
errmsg("DH: could not load DH parameters")));
return false;
}
@ -1007,8 +1007,8 @@ initialize_dh(SSL_CTX *context, bool isServerStart)
{
ereport(isServerStart ? FATAL : LOG,
(errcode(ERRCODE_CONFIG_FILE_ERROR),
(errmsg("DH: could not set DH parameters: %s",
SSLerrmessage(ERR_get_error())))));
errmsg("DH: could not set DH parameters: %s",
SSLerrmessage(ERR_get_error()))));
DH_free(dh);
return false;
}

4
src/backend/postmaster/syslogger.c
Unescape View File

@ -569,7 +569,7 @@ SysLogger_Start(void)
if (pipe(syslogPipe) < 0)
ereport(FATAL,
(errcode_for_socket_access(),
(errmsg("could not create pipe for syslog: %m"))));
errmsg("could not create pipe for syslog: %m")));
}
#else
if (!syslogPipe[0])
@ -583,7 +583,7 @@ SysLogger_Start(void)
if (!CreatePipe(&syslogPipe[0], &syslogPipe[1], &sa, 32768))
ereport(FATAL,
(errcode_for_file_access(),
(errmsg("could not create pipe for syslog: %m"))));
errmsg("could not create pipe for syslog: %m")));
}
#endif

6
src/backend/replication/logical/logical.c
Unescape View File

@ -390,13 +390,13 @@ CreateDecodingContext(XLogRecPtr start_lsn,
if (SlotIsPhysical(slot))
ereport(ERROR,
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
(errmsg("cannot use physical replication slot for logical decoding"))));
errmsg("cannot use physical replication slot for logical decoding")));
if (slot->data.database != MyDatabaseId)
ereport(ERROR,
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
(errmsg("replication slot \"%s\" was not created in this database",
NameStr(slot->data.name)))));
errmsg("replication slot \"%s\" was not created in this database",
NameStr(slot->data.name))));
if (start_lsn == InvalidXLogRecPtr)
{

2
src/backend/replication/logical/logicalfuncs.c
Unescape View File

@ -103,7 +103,7 @@ check_permissions(void)
if (!superuser() && !has_rolreplication(GetUserId()))
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser or replication role to use replication slots"))));
errmsg("must be superuser or replication role to use replication slots")));
}
int

4
src/backend/replication/repl_gram.y
Unescape View File

@ -333,7 +333,7 @@ timeline_history:
if ($2 <= 0)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
(errmsg("invalid timeline %u", $2))));
errmsg("invalid timeline %u", $2)));
cmd = makeNode(TimeLineHistoryCmd);
cmd->timeline = $2;
@ -365,7 +365,7 @@ opt_timeline:
if ($2 <= 0)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
(errmsg("invalid timeline %u", $2))));
errmsg("invalid timeline %u", $2)));
$$ = $2;
}
| /* EMPTY */ { $$ = 0; }

2
src/backend/replication/slot.c
Unescape View File

@ -979,7 +979,7 @@ CheckSlotRequirements(void)
if (max_replication_slots == 0)
ereport(ERROR,
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
(errmsg("replication slots can only be used if max_replication_slots > 0"))));
errmsg("replication slots can only be used if max_replication_slots > 0")));
if (wal_level < WAL_LEVEL_REPLICA)
ereport(ERROR,

4
src/backend/replication/slotfuncs.c
Unescape View File

@ -31,7 +31,7 @@ check_permissions(void)
if (!superuser() && !has_rolreplication(GetUserId()))
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser or replication role to use replication slots"))));
errmsg("must be superuser or replication role to use replication slots")));
}
/*
@ -669,7 +669,7 @@ copy_replication_slot(FunctionCallInfo fcinfo, bool logical_slot)
Assert(!logical_slot);
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
(errmsg("cannot copy a replication slot that doesn't reserve WAL"))));
errmsg("cannot copy a replication slot that doesn't reserve WAL")));
}
/* Overwrite params from optional arguments */

6
src/backend/replication/walsender.c
Unescape View File

@ -563,7 +563,7 @@ StartReplication(StartReplicationCmd *cmd)
if (SlotIsLogical(MyReplicationSlot))
ereport(ERROR,
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
(errmsg("cannot use a logical replication slot for physical replication"))));
errmsg("cannot use a logical replication slot for physical replication")));
}
/*
@ -1499,8 +1499,8 @@ exec_replication_command(const char *cmd_string)
if (parse_rc != 0)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
(errmsg_internal("replication command parser returned %d",
parse_rc))));
errmsg_internal("replication command parser returned %d",
parse_rc)));
cmd_node = replication_parse_result;

4
src/backend/storage/ipc/procarray.c
Unescape View File

@ -3046,14 +3046,14 @@ TerminateOtherDBBackends(Oid databaseId)
if (superuser_arg(proc->roleId) && !superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be a superuser to terminate superuser process"))));
errmsg("must be a superuser to terminate superuser process")));
/* Users can signal backends they have role membership in. */
if (!has_privs_of_role(GetUserId(), proc->roleId) &&
!has_privs_of_role(GetUserId(), DEFAULT_ROLE_SIGNAL_BACKENDID))
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be a member of the role whose process is being terminated or member of pg_signal_backend"))));
errmsg("must be a member of the role whose process is being terminated or member of pg_signal_backend")));
}
}

14
src/backend/storage/ipc/signalfuncs.c
Unescape View File

@ -115,12 +115,12 @@ pg_cancel_backend(PG_FUNCTION_ARGS)
if (r == SIGNAL_BACKEND_NOSUPERUSER)
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be a superuser to cancel superuser query"))));
errmsg("must be a superuser to cancel superuser query")));
if (r == SIGNAL_BACKEND_NOPERMISSION)
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be a member of the role whose query is being canceled or member of pg_signal_backend"))));
errmsg("must be a member of the role whose query is being canceled or member of pg_signal_backend")));
PG_RETURN_BOOL(r == SIGNAL_BACKEND_SUCCESS);
}
@ -139,12 +139,12 @@ pg_terminate_backend(PG_FUNCTION_ARGS)
if (r == SIGNAL_BACKEND_NOSUPERUSER)
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be a superuser to terminate superuser process"))));
errmsg("must be a superuser to terminate superuser process")));
if (r == SIGNAL_BACKEND_NOPERMISSION)
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be a member of the role whose process is being terminated or member of pg_signal_backend"))));
errmsg("must be a member of the role whose process is being terminated or member of pg_signal_backend")));
PG_RETURN_BOOL(r == SIGNAL_BACKEND_SUCCESS);
}
@ -180,10 +180,10 @@ pg_rotate_logfile(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to rotate log files with adminpack 1.0"),
errmsg("must be superuser to rotate log files with adminpack 1.0"),
/* translator: %s is a SQL function name */
errhint("Consider using %s, which is part of core, instead.",
"pg_logfile_rotate()"))));
errhint("Consider using %s, which is part of core, instead.",
"pg_logfile_rotate()")));
if (!Logging_collector)
{

12
src/backend/utils/adt/genfile.c
Unescape View File

@ -78,7 +78,7 @@ convert_and_check_filename(text *arg)
if (path_contains_parent_reference(filename))
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("reference to parent directory (\"..\") not allowed"))));
errmsg("reference to parent directory (\"..\") not allowed")));
/*
* Allow absolute paths if within DataDir or Log_directory, even
@ -89,12 +89,12 @@ convert_and_check_filename(text *arg)
!path_is_prefix_of_path(Log_directory, filename)))
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("absolute path not allowed"))));
errmsg("absolute path not allowed")));
}
else if (!path_is_relative_and_below_cwd(filename))
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("path must be in or below the current directory"))));
errmsg("path must be in or below the current directory")));
return filename;
}
@ -218,10 +218,10 @@ pg_read_file(PG_FUNCTION_ARGS)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to read files with adminpack 1.0"),
errmsg("must be superuser to read files with adminpack 1.0"),
/* translator: %s is a SQL function name */
errhint("Consider using %s, which is part of core, instead.",
"pg_file_read()"))));
errhint("Consider using %s, which is part of core, instead.",
"pg_file_read()")));
/* handle optional arguments */
if (PG_NARGS() >= 3)

2
src/backend/utils/adt/pg_upgrade_support.c
Unescape View File

@ -26,7 +26,7 @@ do { \
if (!IsBinaryUpgrade) \
ereport(ERROR, \
(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM), \
(errmsg("function can only be called when server is in binary upgrade mode")))); \
errmsg("function can only be called when server is in binary upgrade mode"))); \
} while (0)
Datum

2
src/backend/utils/misc/guc.c
Unescape View File

@ -7993,7 +7993,7 @@ AlterSystemSetConfigFile(AlterSystemStmt *altersysstmt)
if (!superuser())
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to execute ALTER SYSTEM command"))));
errmsg("must be superuser to execute ALTER SYSTEM command")));
/*
* Extract statement arguments

Write Preview
Loading…
Cancel
Save