aboutsummaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2016-06-07 14:18:08 -0400
committerPeter Eisentraut <peter_e@gmx.net>2016-06-07 14:18:55 -0400
commit5c6d2a5e7c83bf6e157fe4ca0ab9b123012289e9 (patch)
tree4674cd6272ec253c3dec2842f19a4e17d9054361 /src/backend
parentdf7cc3976db6980d115d1dc6556f021d9783d579 (diff)
downloadpostgresql-5c6d2a5e7c83bf6e157fe4ca0ab9b123012289e9.tar.gz
postgresql-5c6d2a5e7c83bf6e157fe4ca0ab9b123012289e9.zip
Message style and wording fixes
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/access/gin/ginbulk.c2
-rw-r--r--src/backend/access/transam/xlogfuncs.c6
-rw-r--r--src/backend/commands/aggregatecmds.c4
-rw-r--r--src/backend/commands/operatorcmds.c2
-rw-r--r--src/backend/utils/adt/misc.c4
5 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/access/gin/ginbulk.c b/src/backend/access/gin/ginbulk.c
index 134a8c7377c..d6422ea91eb 100644
--- a/src/backend/access/gin/ginbulk.c
+++ b/src/backend/access/gin/ginbulk.c
@@ -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;
diff --git a/src/backend/access/transam/xlogfuncs.c b/src/backend/access/transam/xlogfuncs.c
index d69a924a7ba..de493fad7a4 100644
--- a/src/backend/access/transam/xlogfuncs.c
+++ b/src/backend/access/transam/xlogfuncs.c
@@ -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
diff --git a/src/backend/commands/aggregatecmds.c b/src/backend/commands/aggregatecmds.c
index 5c4d576b866..7f45ba94070 100644
--- a/src/backend/commands/aggregatecmds.c
+++ b/src/backend/commands/aggregatecmds.c
@@ -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))));
/*
diff --git a/src/backend/commands/operatorcmds.c b/src/backend/commands/operatorcmds.c
index 672f2eb212f..11036241212 100644
--- a/src/backend/commands/operatorcmds.c
+++ b/src/backend/commands/operatorcmds.c
@@ -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
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index a44fa38173a..39f43863d62 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -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),