Message style and spelling improvements

diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 8227bfdb88ba8bf2b92ba133b541d796a018e2e1..cdb0343d104cfec50b751edb83dae2239d89687a 100644 (file)
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -714,7 +714,7 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate)
                ereport(ERROR,
                        (errmsg("index \"%s\" contains an inner tuple marked as invalid",
                                RelationGetRelationName(r)),
-                        errdetail("This is caused by an incomplete page split at crash recovery before upgrading to 9.1."),
+                        errdetail("This is caused by an incomplete page split at crash recovery before upgrading to PostgreSQL 9.1."),
                         errhint("Please REINDEX it.")));
 
            /*

diff --git a/src/backend/access/gist/gistvacuum.c b/src/backend/access/gist/gistvacuum.c
index 33e6f341548ad6cd07c72096d16d92a698731f17..50c6270b005926855c74eb76bc93a89e2bd10797 100644 (file)
--- a/src/backend/access/gist/gistvacuum.c
+++ b/src/backend/access/gist/gistvacuum.c
@@ -270,7 +270,7 @@ gistbulkdelete(PG_FUNCTION_ARGS)
                    ereport(LOG,
                            (errmsg("index \"%s\" contains an inner tuple marked as invalid",
                                    RelationGetRelationName(rel)),
-                            errdetail("This is caused by an incomplete page split at crash recovery before upgrading to 9.1."),
+                            errdetail("This is caused by an incomplete page split at crash recovery before upgrading to PostgreSQL 9.1."),
                             errhint("Please REINDEX it.")));
            }
        }

diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c
index d848926ae55ef8ec2b341bd55cea813fc487cdb8..58695690500e69c2ddabef9c3842d467af24798d 100644 (file)
--- a/src/backend/commands/extension.c
+++ b/src/backend/commands/extension.c
@@ -626,7 +626,7 @@ read_extension_aux_control_file(const ExtensionControlFile *pcontrol,
 }
 
 /*
- * Read a SQL script file into a string, and convert to database encoding
+ * Read an SQL script file into a string, and convert to database encoding
  */
 static char *
 read_extension_script_file(const ExtensionControlFile *control,
@@ -2099,7 +2099,7 @@ pg_extension_config_dump(PG_FUNCTION_ARGS)
        ereport(ERROR,
                (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
                 errmsg("pg_extension_config_dump() can only be called "
-                       "from a SQL script executed by CREATE EXTENSION")));
+                       "from an SQL script executed by CREATE EXTENSION")));
 
    /*
     * Check that the table exists and is a member of the extension being

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 912f45c052a902f1403b47cbb9496ed0bbb676eb..557d5417addbc70d61ed2c199f4e01de47db78e0 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -3966,28 +3966,28 @@ find_composite_type_dependencies(Oid typeOid, Relation origRelation,
            if (origTypeName)
                ereport(ERROR,
                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                        errmsg("cannot alter type \"%s\" because column \"%s\".\"%s\" uses it",
+                        errmsg("cannot alter type \"%s\" because column \"%s.%s\" uses it",
                                origTypeName,
                                RelationGetRelationName(rel),
                                NameStr(att->attname))));
            else if (origRelation->rd_rel->relkind == RELKIND_COMPOSITE_TYPE)
                ereport(ERROR,
                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                        errmsg("cannot alter type \"%s\" because column \"%s\".\"%s\" uses it",
+                        errmsg("cannot alter type \"%s\" because column \"%s.%s\" uses it",
                                RelationGetRelationName(origRelation),
                                RelationGetRelationName(rel),
                                NameStr(att->attname))));
            else if (origRelation->rd_rel->relkind == RELKIND_FOREIGN_TABLE)
                ereport(ERROR,
                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                        errmsg("cannot alter foreign table \"%s\" because column \"%s\".\"%s\" uses its rowtype",
+                        errmsg("cannot alter foreign table \"%s\" because column \"%s.%s\" uses its row type",
                                RelationGetRelationName(origRelation),
                                RelationGetRelationName(rel),
                                NameStr(att->attname))));
            else
                ereport(ERROR,
                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                        errmsg("cannot alter table \"%s\" because column \"%s\".\"%s\" uses its rowtype",
+                        errmsg("cannot alter table \"%s\" because column \"%s.%s\" uses its row type",
                                RelationGetRelationName(origRelation),
                                RelationGetRelationName(rel),
                                NameStr(att->attname))));
@@ -6648,7 +6648,7 @@ ATPrepAlterColumnType(List **wqueue,
         * expression, else just take the old value and try to coerce it.  We
         * do this first so that type incompatibility can be detected before
         * we waste effort, and because we need the expression to be parsed
-        * against the original table rowtype.
+        * against the original table row type.
         */
        if (transform)
        {
@@ -7493,7 +7493,7 @@ ATExecChangeOwner(Oid relationOid, Oid newOwnerId, bool recursing, LOCKMODE lock
                                    newOwnerId);
 
        /*
-        * Also change the ownership of the table's rowtype, if it has one
+        * Also change the ownership of the table's row type, if it has one
         */
        if (tuple_class->relkind != RELKIND_INDEX)
            AlterTypeOwnerInternal(tuple_class->reltype, newOwnerId,
@@ -9005,7 +9005,7 @@ AlterTableNamespace(RangeVar *relation, const char *newschema,
 
    AlterRelationNamespaceInternal(classRel, relid, oldNspOid, nspOid, true);
 
-   /* Fix the table's rowtype too */
+   /* Fix the table's row type too */
    AlterTypeNamespaceInternal(rel->rd_rel->reltype, nspOid, false, false);
 
    /* Fix other dependent stuff */
@@ -9089,7 +9089,7 @@ AlterIndexNamespaces(Relation classRel, Relation rel,
        /*
         * Note: currently, the index will not have its own dependency on the
         * namespace, so we don't need to do changeDependencyFor(). There's no
-        * rowtype in pg_type, either.
+        * row type in pg_type, either.
         */
        AlterRelationNamespaceInternal(classRel, indexOid,
                                       oldNspOid, newNspOid,

diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
index 51899c6b5b4d342edc22dd6ed374bcf24a19a2a3..622efe592d406e375f894d1ba0cd3b2633e4cb2c 100644 (file)
--- a/src/backend/parser/parse_utilcmd.c
+++ b/src/backend/parser/parse_utilcmd.c
@@ -1481,21 +1481,21 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
            ereport(ERROR,
                    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
                     errmsg("\"%s\" is not a unique index", index_name),
-                    errdetail("Cannot create a PRIMARY KEY or UNIQUE constraint using such an index."),
+                    errdetail("Cannot create a primary key or unique constraint using such an index."),
                     parser_errposition(cxt->pstate, constraint->location)));
 
        if (RelationGetIndexExpressions(index_rel) != NIL)
            ereport(ERROR,
                    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
                     errmsg("index \"%s\" contains expressions", index_name),
-                    errdetail("Cannot create a PRIMARY KEY or UNIQUE constraint using such an index."),
+                    errdetail("Cannot create a primary key or unique constraint using such an index."),
                     parser_errposition(cxt->pstate, constraint->location)));
 
        if (RelationGetIndexPredicate(index_rel) != NIL)
            ereport(ERROR,
                    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
                     errmsg("\"%s\" is a partial index", index_name),
-                    errdetail("Cannot create a PRIMARY KEY or UNIQUE constraint using such an index."),
+                    errdetail("Cannot create a primary key or unique constraint using such an index."),
                     parser_errposition(cxt->pstate, constraint->location)));
 
        /*
@@ -1565,7 +1565,7 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
                ereport(ERROR,
                        (errcode(ERRCODE_WRONG_OBJECT_TYPE),
                         errmsg("index \"%s\" does not have default sorting behavior", index_name),
-                        errdetail("Cannot create a PRIMARY KEY or UNIQUE constraint using such an index."),
+                        errdetail("Cannot create a primary key or unique constraint using such an index."),
                     parser_errposition(cxt->pstate, constraint->location)));
 
            constraint->keys = lappend(constraint->keys, makeString(attname));

diff --git a/src/backend/replication/syncrep.c b/src/backend/replication/syncrep.c
index 08a40866f074dd3dd9a388f7fbffad9c369f97ce..2b52d1616bebf777f4f32d8a015ae6721dd4eb4a 100644 (file)
--- a/src/backend/replication/syncrep.c
+++ b/src/backend/replication/syncrep.c
@@ -202,7 +202,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
         * is not true: it's already committed locally. The former is no good
         * either: the client has requested synchronous replication, and is
         * entitled to assume that an acknowledged commit is also replicated,
-        * which may not be true. So in this case we issue a WARNING (which
+        * which might not be true. So in this case we issue a WARNING (which
         * some clients may be able to interpret) and shut off further output.
         * We do NOT reset ProcDiePending, so that the process will die after
         * the commit is cleaned up.
@@ -212,7 +212,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
            ereport(WARNING,
                    (errcode(ERRCODE_ADMIN_SHUTDOWN),
                     errmsg("canceling the wait for synchronous replication and terminating connection due to administrator command"),
-                    errdetail("The transaction has already committed locally, but may not have been replicated to the standby.")));
+                    errdetail("The transaction has already committed locally, but might not have been replicated to the standby.")));
            whereToSendOutput = DestNone;
            SyncRepCancelWait();
            break;
@@ -229,7 +229,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
            QueryCancelPending = false;
            ereport(WARNING,
                    (errmsg("canceling wait for synchronous replication due to user request"),
-                    errdetail("The transaction has already committed locally, but may not have been replicated to the standby.")));
+                    errdetail("The transaction has already committed locally, but might not have been replicated to the standby.")));
            SyncRepCancelWait();
            break;
        }

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 92391eda2fd505abf1e28828014536f818bea953..1c6f197748391e85747e51121534cc1e804a3552 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -2965,7 +2965,7 @@ static struct config_string ConfigureNamesString[] =
 
    {
        {"synchronous_standby_names", PGC_SIGHUP, WAL_REPLICATION,
-           gettext_noop("List of potential standby names to synchronise with."),
+           gettext_noop("List of potential standby names to synchronize with."),
            NULL,
            GUC_LIST_INPUT
        },
@@ -8234,7 +8234,7 @@ check_temp_buffers(int *newval, void **extra, GucSource source)
     */
    if (NLocBuffer && NLocBuffer != *newval)
    {
-       GUC_check_errdetail("\"temp_buffers\" cannot be changed after any temp tables have been accessed in the session.");
+       GUC_check_errdetail("\"temp_buffers\" cannot be changed after any temporary tables have been accessed in the session.");
        return false;
    }
    return true;

diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
index f84da45de650591f3d6a0e1ced28bb98e8b69431..9ab84f983ed6376ef9eaad7ed8e752a4bff0f0ec 100644 (file)
--- a/src/test/regress/expected/alter_table.out
+++ b/src/test/regress/expected/alter_table.out
@@ -1509,7 +1509,7 @@ drop table another;
 create table tab1 (a int, b text);
 create table tab2 (x int, y tab1);
 alter table tab1 alter column b type varchar; -- fails
-ERROR:  cannot alter table "tab1" because column "tab2"."y" uses its rowtype
+ERROR:  cannot alter table "tab1" because column "tab2.y" uses its row type
 -- disallow recursive containment of row types
 create temp table recur1 (f1 int);
 alter table recur1 add column f2 recur1; -- fails
@@ -1845,7 +1845,7 @@ DROP TYPE test_type;
 CREATE TYPE test_type1 AS (a int, b text);
 CREATE TABLE test_tbl1 (x int, y test_type1);
 ALTER TYPE test_type1 ALTER ATTRIBUTE b TYPE varchar; -- fails
-ERROR:  cannot alter type "test_type1" because column "test_tbl1"."y" uses it
+ERROR:  cannot alter type "test_type1" because column "test_tbl1.y" uses it
 CREATE TYPE test_type2 AS (a int, b text);
 CREATE TABLE test_tbl2 OF test_type2;
 CREATE TABLE test_tbl2_subclass () INHERITS (test_tbl2);

diff --git a/src/test/regress/expected/domain.out b/src/test/regress/expected/domain.out
index 2586b07241e4cec819750156c448436375320a88..34bc31ab3806a455bd6517d19779fc5cf563fe29 100644 (file)
--- a/src/test/regress/expected/domain.out
+++ b/src/test/regress/expected/domain.out
@@ -510,12 +510,12 @@ create type ddtest1 as (f1 posint);
 create table ddtest2(f1 ddtest1);
 insert into ddtest2 values(row(-1));
 alter domain posint add constraint c1 check(value >= 0);
-ERROR:  cannot alter type "posint" because column "ddtest2"."f1" uses it
+ERROR:  cannot alter type "posint" because column "ddtest2.f1" uses it
 drop table ddtest2;
 create table ddtest2(f1 ddtest1[]);
 insert into ddtest2 values('{(-1)}');
 alter domain posint add constraint c1 check(value >= 0);
-ERROR:  cannot alter type "posint" because column "ddtest2"."f1" uses it
+ERROR:  cannot alter type "posint" because column "ddtest2.f1" uses it
 drop table ddtest2;
 alter domain posint add constraint c1 check(value >= 0);
 create domain posint2 as posint check (value % 2 = 0);

diff --git a/src/test/regress/expected/foreign_data.out b/src/test/regress/expected/foreign_data.out
index e18eed8c1cf04ffc3988fda27d25ea492139f1e9..def850ba893216f76b765de6972a84b64fe14e7f 100644 (file)
--- a/src/test/regress/expected/foreign_data.out
+++ b/src/test/regress/expected/foreign_data.out
@@ -701,7 +701,7 @@ ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 SET DATA TYPE text;
 -- can't change the column type if it's used elsewhere
 CREATE TABLE use_ft1_column_type (x ft1);
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 SET DATA TYPE integer; -- ERROR
-ERROR:  cannot alter foreign table "ft1" because column "use_ft1_column_type"."x" uses its rowtype
+ERROR:  cannot alter foreign table "ft1" because column "use_ft1_column_type.x" uses its row type
 DROP TABLE use_ft1_column_type;
 ALTER FOREIGN TABLE ft1 ADD CONSTRAINT ft1_c9_check CHECK (c9 < 0); -- ERROR
 ERROR:  "ft1" is not a table

diff --git a/src/test/regress/expected/rowtypes.out b/src/test/regress/expected/rowtypes.out
index 9430bd9b486f7316341819f37ed8ab8d2e4e87fd..a5ddbdc140566346d2e91d06bc5145697b310751 100644 (file)
--- a/src/test/regress/expected/rowtypes.out
+++ b/src/test/regress/expected/rowtypes.out
@@ -84,7 +84,7 @@ select * from people;
 
 -- at the moment this will not work due to ALTER TABLE inadequacy:
 alter table fullname add column suffix text default '';
-ERROR:  cannot alter table "fullname" because column "people"."fn" uses its rowtype
+ERROR:  cannot alter table "fullname" because column "people.fn" uses its row type
 -- but this should work:
 alter table fullname add column suffix text default null;
 select * from people;