mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-02-11 19:20:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve some messages

Browse Source
This commit is contained in:
Peter Eisentraut 2015-12-10 22:05:27 -05:00
parent 8b469bd7c4
commit a351705d8a
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/access/transam/commit_ts.c
View File

@ -384,7 +384,7 @@ error_commit_ts_disabled(void)
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
errmsg("could not get commit timestamp data"),
RecoveryInProgress() ?
errhint("Make sure the configuration parameter \"%s\" is set in the master server.",
errhint("Make sure the configuration parameter \"%s\" is set on the master server.",
"track_commit_timestamp") :
errhint("Make sure the configuration parameter \"%s\" is set.",
"track_commit_timestamp")));

2
src/backend/catalog/objectaddress.c
View File

@ -1901,7 +1901,7 @@ pg_get_object_address(PG_FUNCTION_ARGS)
if (list_length(name) < 1)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("name list must be of length at least %d", 1)));
errmsg("name list length must be at least %d", 1)));
}
/*

4
src/backend/commands/policy.c
View File

@ -167,8 +167,8 @@ policy_role_list_to_array(List *roles, int *num_roles)
{
ereport(WARNING,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("ignoring roles specified other than public"),
errhint("All roles are members of the public role.")));
errmsg("ignoring specified roles other than PUBLIC"),
errhint("All roles are members of the PUBLIC role.")));
*num_roles = 1;
}
role_oids[0] = ObjectIdGetDatum(ACL_ID_PUBLIC);

2
src/backend/commands/user.c
View File

@ -959,7 +959,7 @@ DropRole(DropRoleStmt *stmt)
if (rolspec->roletype != ROLESPEC_CSTRING)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("cannot use special role specifier in \"%s\"", "DROP ROLE")));
errmsg("cannot use special role specifier in DROP ROLE")));
role = rolspec->rolename;
tuple = SearchSysCache1(AUTHNAME, PointerGetDatum(role));

4
src/backend/executor/nodeCustom.c
View File

@ -144,7 +144,7 @@ ExecCustomMarkPos(CustomScanState *node)
if (!node->methods->MarkPosCustomScan)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("custom-scan \"%s\" does not support MarkPos",
errmsg("custom scan \"%s\" does not support MarkPos",
node->methods->CustomName)));
node->methods->MarkPosCustomScan(node);
}
@ -155,7 +155,7 @@ ExecCustomRestrPos(CustomScanState *node)
if (!node->methods->RestrPosCustomScan)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("custom-scan \"%s\" does not support MarkPos",
errmsg("custom scan \"%s\" does not support MarkPos",
node->methods->CustomName)));
node->methods->RestrPosCustomScan(node);
}

4
src/backend/utils/adt/jsonb.c
View File

@ -1238,7 +1238,7 @@ jsonb_build_object(PG_FUNCTION_ARGS)
if (val_type == InvalidOid || val_type == UNKNOWNOID)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("arg %d: could not determine data type", i + 2)));
errmsg("argument %d: could not determine data type", i + 2)));
add_jsonb(arg, PG_ARGISNULL(i + 1), &result, val_type, false);
}
@ -1300,7 +1300,7 @@ jsonb_build_array(PG_FUNCTION_ARGS)
if (val_type == InvalidOid || val_type == UNKNOWNOID)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("arg %d: could not determine data type", i + 1)));
errmsg("argument %d: could not determine data type", i + 1)));
add_jsonb(arg, PG_ARGISNULL(i), &result, val_type, false);
}

2
src/backend/utils/adt/jsonfuncs.c
View File

@ -3464,7 +3464,7 @@ jsonb_delete_idx(PG_FUNCTION_ARGS)
if (JB_ROOT_IS_OBJECT(in))
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("cannot delete from object using integer subscript")));
errmsg("cannot delete from object using integer index")));
if (JB_ROOT_COUNT(in) == 0)
PG_RETURN_JSONB(in);

2
src/test/regress/expected/jsonb.out
View File

@ -3173,7 +3173,7 @@ select '[]'::jsonb - 'a';
select '"a"'::jsonb - 1; -- error
ERROR: cannot delete from scalar
select '{}'::jsonb - 1; -- error
ERROR: cannot delete from object using integer subscript
ERROR: cannot delete from object using integer index
select '[]'::jsonb - 1;
?column?
----------

2
src/test/regress/expected/object_address.out
View File

@ -39,7 +39,7 @@ CREATE TRANSFORM FOR int LANGUAGE SQL (
SELECT pg_get_object_address('stone', '{}', '{}');
ERROR: unrecognized object type "stone"
SELECT pg_get_object_address('table', '{}', '{}');
ERROR: name list must be of length at least 1
ERROR: name list length must be at least 1
SELECT pg_get_object_address('table', '{NULL}', '{}');
ERROR: name or argument lists may not contain nulls
-- unrecognized object types