aboutsummaryrefslogtreecommitdiff
path: root/src/backend/commands
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2015-10-28 20:23:53 -0400
committerPeter Eisentraut <peter_e@gmx.net>2015-10-28 20:38:36 -0400
commita8d585c0915939a42acdb529d8e0eb832935d45f (patch)
tree4181e9e00ec2cdd0ddd4f56a2c12e48e2f58b2f2 /src/backend/commands
parentd45565162494c75eae91481eda17dc0c8ecab5db (diff)
downloadpostgresql-a8d585c0915939a42acdb529d8e0eb832935d45f.tar.gz
postgresql-a8d585c0915939a42acdb529d8e0eb832935d45f.zip
Message style improvements
Message style, plurals, quoting, spelling, consistency with similar messages
Diffstat (limited to 'src/backend/commands')
-rw-r--r--src/backend/commands/copy.c2
-rw-r--r--src/backend/commands/matview.c2
-rw-r--r--src/backend/commands/tablecmds.c2
-rw-r--r--src/backend/commands/tablespace.c2
-rw-r--r--src/backend/commands/vacuumlazy.c8
5 files changed, 10 insertions, 6 deletions
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index f409aa7393a..9a52ec6c3f8 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -875,7 +875,7 @@ DoCopy(const CopyStmt *stmt, const char *queryString, uint64 *processed)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("COPY FROM not supported with row level security."),
- errhint("Use direct INSERT statements instead.")));
+ errhint("Use INSERT statements instead.")));
/* Build target list */
cr = makeNode(ColumnRef);
diff --git a/src/backend/commands/matview.c b/src/backend/commands/matview.c
index 5492e5985bf..745b76527d1 100644
--- a/src/backend/commands/matview.c
+++ b/src/backend/commands/matview.c
@@ -608,7 +608,7 @@ refresh_by_match_merge(Oid matviewOid, Oid tempOid, Oid relowner,
*/
ereport(ERROR,
(errcode(ERRCODE_CARDINALITY_VIOLATION),
- errmsg("new data for \"%s\" contains duplicate rows without any null columns",
+ errmsg("new data for materialized view \"%s\" contains duplicate rows without any null columns",
RelationGetRelationName(matviewRel)),
errdetail("Row: %s",
SPI_getvalue(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1))));
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 76793ef02a4..55ab2096cc3 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -9811,7 +9811,7 @@ AlterTableMoveAll(AlterTableMoveAllStmt *stmt)
!ConditionalLockRelationOid(relOid, AccessExclusiveLock))
ereport(ERROR,
(errcode(ERRCODE_OBJECT_IN_USE),
- errmsg("aborting because lock on relation \"%s\".\"%s\" is not available",
+ errmsg("aborting because lock on relation \"%s.%s\" is not available",
get_namespace_name(relForm->relnamespace),
NameStr(relForm->relname))));
else
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
index 7588b7ae264..18ae4ab10af 100644
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -857,7 +857,7 @@ remove_tablespace_symlink(const char *linkloc)
return;
ereport(ERROR,
(errcode_for_file_access(),
- errmsg("could not stat \"%s\": %m", linkloc)));
+ errmsg("could not stat file \"%s\": %m", linkloc)));
}
if (S_ISDIR(st.st_mode))
diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c
index a01cfb4c043..24298894fae 100644
--- a/src/backend/commands/vacuumlazy.c
+++ b/src/backend/commands/vacuumlazy.c
@@ -1124,9 +1124,13 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
nkeep);
appendStringInfo(&buf, _("There were %.0f unused item pointers.\n"),
nunused);
- appendStringInfo(&buf, _("Skipped %u pages due to buffer pins.\n"),
+ appendStringInfo(&buf, ngettext("Skipped %u page due to buffer pins.\n",
+ "Skipped %u pages due to buffer pins.\n",
+ vacrelstats->pinskipped_pages),
vacrelstats->pinskipped_pages);
- appendStringInfo(&buf, _("%u pages are entirely empty.\n"),
+ appendStringInfo(&buf, ngettext("%u page is entirely empty.\n",
+ "%u pages are entirely empty.\n",
+ empty_pages),
empty_pages);
appendStringInfo(&buf, _("%s."),
pg_rusage_show(&ru0));