Message style and wording fixes
This commit is contained in:
parent
df7cc3976d
commit
5c6d2a5e7c
|
@ -42,7 +42,7 @@ ginCombineData(RBNode *existing, const RBNode *newdata, void *arg)
|
|||
ereport(ERROR,
|
||||
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
|
||||
errmsg("posting list is too long"),
|
||||
errhint("Reduce maintenance_work_mem")));
|
||||
errhint("Reduce maintenance_work_mem.")));
|
||||
|
||||
accum->allocatedMemory -= GetMemoryChunkSpace(eo->list);
|
||||
eo->maxcount *= 2;
|
||||
|
|
|
@ -153,7 +153,7 @@ pg_stop_backup(PG_FUNCTION_ARGS)
|
|||
ereport(ERROR,
|
||||
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
|
||||
errmsg("non-exclusive backup in progress"),
|
||||
errhint("did you mean to use pg_stop_backup('f')?")));
|
||||
errhint("Did you mean to use pg_stop_backup('f')?")));
|
||||
|
||||
/*
|
||||
* Exclusive backups were typically started in a different connection,
|
||||
|
@ -227,7 +227,7 @@ pg_stop_backup_v2(PG_FUNCTION_ARGS)
|
|||
ereport(ERROR,
|
||||
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
|
||||
errmsg("non-exclusive backup in progress"),
|
||||
errhint("did you mean to use pg_stop_backup('f')?")));
|
||||
errhint("Did you mean to use pg_stop_backup('f')?")));
|
||||
|
||||
/*
|
||||
* Stop the exclusive backup, and since we're in an exclusive backup
|
||||
|
@ -245,7 +245,7 @@ pg_stop_backup_v2(PG_FUNCTION_ARGS)
|
|||
ereport(ERROR,
|
||||
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
|
||||
errmsg("non-exclusive backup is not in progress"),
|
||||
errhint("did you mean to use pg_stop_backup('t')?")));
|
||||
errhint("Did you mean to use pg_stop_backup('t')?")));
|
||||
|
||||
/*
|
||||
* Stop the non-exclusive backup. Return a copy of the backup
|
||||
|
|
|
@ -344,7 +344,7 @@ DefineAggregate(List *name, List *args, bool oldstyle, List *parameters,
|
|||
if (transTypeId != INTERNALOID)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
|
||||
errmsg("a serialization type must only be specified when the aggregate transition data type is \"%s\"",
|
||||
errmsg("a serialization type must only be specified when the aggregate transition data type is %s",
|
||||
format_type_be(INTERNALOID))));
|
||||
|
||||
serialTypeId = typenameTypeId(NULL, serialType);
|
||||
|
@ -366,7 +366,7 @@ DefineAggregate(List *name, List *args, bool oldstyle, List *parameters,
|
|||
if (serialTypeId == INTERNALOID)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
|
||||
errmsg("aggregate serialization type cannot be \"%s\"",
|
||||
errmsg("aggregate serialization data type cannot be %s",
|
||||
format_type_be(serialTypeId))));
|
||||
|
||||
/*
|
||||
|
|
|
@ -448,7 +448,7 @@ AlterOperator(AlterOperatorStmt *stmt)
|
|||
{
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_SYNTAX_ERROR),
|
||||
errmsg("operator attribute \"%s\" can not be changed",
|
||||
errmsg("operator attribute \"%s\" cannot be changed",
|
||||
defel->defname)));
|
||||
}
|
||||
else
|
||||
|
|
|
@ -849,13 +849,13 @@ parse_ident(PG_FUNCTION_ARGS)
|
|||
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
||||
errmsg("string is not a valid identifier: \"%s\"",
|
||||
text_to_cstring(qualname)),
|
||||
errdetail("No valid identifier before \".\" symbol.")));
|
||||
errdetail("No valid identifier before \".\".")));
|
||||
else if (after_dot)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
||||
errmsg("string is not a valid identifier: \"%s\"",
|
||||
text_to_cstring(qualname)),
|
||||
errdetail("No valid identifier after \".\" symbol.")));
|
||||
errdetail("No valid identifier after \".\".")));
|
||||
else
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
||||
|
|
|
@ -459,7 +459,7 @@ getTimelineHistory(ControlFileData *controlFile, int *nentries)
|
|||
else if (controlFile == &ControlFile_target)
|
||||
histfile = slurpFile(datadir_target, path, NULL);
|
||||
else
|
||||
pg_fatal("Invalid control file");
|
||||
pg_fatal("invalid control file");
|
||||
|
||||
history = rewind_parseTimeLineHistory(histfile, tli, nentries);
|
||||
pg_free(histfile);
|
||||
|
@ -685,7 +685,7 @@ syncTargetDirectory(const char *argv0)
|
|||
strlcpy(full_path, progname, sizeof(full_path));
|
||||
|
||||
if (ret == -1)
|
||||
pg_fatal("The program \"initdb\" is needed by %s but was \n"
|
||||
pg_fatal("The program \"initdb\" is needed by %s but was\n"
|
||||
"not found in the same directory as \"%s\".\n"
|
||||
"Check your installation.\n", progname, full_path);
|
||||
else
|
||||
|
|
|
@ -110,17 +110,17 @@ ORDER BY 1;
|
|||
-- Test invalid options.
|
||||
--
|
||||
ALTER OPERATOR === (boolean, boolean) SET (COMMUTATOR = ====);
|
||||
ERROR: operator attribute "commutator" can not be changed
|
||||
ERROR: operator attribute "commutator" cannot be changed
|
||||
ALTER OPERATOR === (boolean, boolean) SET (NEGATOR = ====);
|
||||
ERROR: operator attribute "negator" can not be changed
|
||||
ERROR: operator attribute "negator" cannot be changed
|
||||
ALTER OPERATOR === (boolean, boolean) SET (RESTRICT = non_existent_func);
|
||||
ERROR: function non_existent_func(internal, oid, internal, integer) does not exist
|
||||
ALTER OPERATOR === (boolean, boolean) SET (JOIN = non_existent_func);
|
||||
ERROR: function non_existent_func(internal, oid, internal, smallint, internal) does not exist
|
||||
ALTER OPERATOR === (boolean, boolean) SET (COMMUTATOR = !==);
|
||||
ERROR: operator attribute "commutator" can not be changed
|
||||
ERROR: operator attribute "commutator" cannot be changed
|
||||
ALTER OPERATOR === (boolean, boolean) SET (NEGATOR = !==);
|
||||
ERROR: operator attribute "negator" can not be changed
|
||||
ERROR: operator attribute "negator" cannot be changed
|
||||
--
|
||||
-- Test permission check. Must be owner to ALTER OPERATOR.
|
||||
--
|
||||
|
|
|
@ -109,7 +109,7 @@ CREATE AGGREGATE myavg (numeric)
|
|||
sfunc = numeric_avg_accum,
|
||||
serialtype = internal
|
||||
);
|
||||
ERROR: aggregate serialization type cannot be "internal"
|
||||
ERROR: aggregate serialization data type cannot be internal
|
||||
-- if serialtype is specified we need a serialfunc and deserialfunc
|
||||
CREATE AGGREGATE myavg (numeric)
|
||||
(
|
||||
|
|
|
@ -154,10 +154,10 @@ SELECT parse_ident(' ');
|
|||
ERROR: string is not a valid identifier: " "
|
||||
SELECT parse_ident(' .aaa');
|
||||
ERROR: string is not a valid identifier: " .aaa"
|
||||
DETAIL: No valid identifier before "." symbol.
|
||||
DETAIL: No valid identifier before ".".
|
||||
SELECT parse_ident(' aaa . ');
|
||||
ERROR: string is not a valid identifier: " aaa . "
|
||||
DETAIL: No valid identifier after "." symbol.
|
||||
DETAIL: No valid identifier after ".".
|
||||
SELECT parse_ident('aaa.a%b');
|
||||
ERROR: string is not a valid identifier: "aaa.a%b"
|
||||
SELECT parse_ident(E'X\rXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX');
|
||||
|
@ -188,10 +188,10 @@ SELECT parse_ident('10.20');
|
|||
ERROR: string is not a valid identifier: "10.20"
|
||||
SELECT parse_ident('.');
|
||||
ERROR: string is not a valid identifier: "."
|
||||
DETAIL: No valid identifier before "." symbol.
|
||||
DETAIL: No valid identifier before ".".
|
||||
SELECT parse_ident('.1020');
|
||||
ERROR: string is not a valid identifier: ".1020"
|
||||
DETAIL: No valid identifier before "." symbol.
|
||||
DETAIL: No valid identifier before ".".
|
||||
SELECT parse_ident('xxx.1020');
|
||||
ERROR: string is not a valid identifier: "xxx.1020"
|
||||
DETAIL: No valid identifier after "." symbol.
|
||||
DETAIL: No valid identifier after ".".
|
||||
|
|
Loading…
Reference in New Issue