Skip to content

Commit e2a0cb1

Browse files
peterepetere
committed
Message style and spelling improvements
1 parent ca59dfa commit e2a0cb1

File tree

11 files changed

+27
-27
lines changed

11 files changed

+27
-27
lines changed

‎src/backend/access/gist/gist.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate)
714714
ereport(ERROR,
715715
(errmsg("index \"%s\" contains an inner tuple marked as invalid",
716716
RelationGetRelationName(r)),
717-
errdetail("This is caused by an incomplete page split at crash recovery before upgrading to 9.1."),
717+
errdetail("This is caused by an incomplete page split at crash recovery before upgrading to PostgreSQL 9.1."),
718718
errhint("Please REINDEX it.")));
719719

720720
/*

‎src/backend/access/gist/gistvacuum.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ gistbulkdelete(PG_FUNCTION_ARGS)
270270
ereport(LOG,
271271
(errmsg("index \"%s\" contains an inner tuple marked as invalid",
272272
RelationGetRelationName(rel)),
273-
errdetail("This is caused by an incomplete page split at crash recovery before upgrading to 9.1."),
273+
errdetail("This is caused by an incomplete page split at crash recovery before upgrading to PostgreSQL 9.1."),
274274
errhint("Please REINDEX it.")));
275275
}
276276
}

‎src/backend/commands/extension.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ read_extension_aux_control_file(const ExtensionControlFile *pcontrol,
626626
}
627627

628628
/*
629-
* Read a SQL script file into a string, and convert to database encoding
629+
* Read an SQL script file into a string, and convert to database encoding
630630
*/
631631
static char *
632632
read_extension_script_file(const ExtensionControlFile *control,
@@ -2099,7 +2099,7 @@ pg_extension_config_dump(PG_FUNCTION_ARGS)
20992099
ereport(ERROR,
21002100
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
21012101
errmsg("pg_extension_config_dump() can only be called "
2102-
"from a SQL script executed by CREATE EXTENSION")));
2102+
"from an SQL script executed by CREATE EXTENSION")));
21032103

21042104
/*
21052105
* Check that the table exists and is a member of the extension being

‎src/backend/commands/tablecmds.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3966,28 +3966,28 @@ find_composite_type_dependencies(Oid typeOid, Relation origRelation,
39663966
if (origTypeName)
39673967
ereport(ERROR,
39683968
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
3969-
errmsg("cannot alter type \"%s\" because column \"%s\".\"%s\" uses it",
3969+
errmsg("cannot alter type \"%s\" because column \"%s.%s\" uses it",
39703970
origTypeName,
39713971
RelationGetRelationName(rel),
39723972
NameStr(att->attname))));
39733973
else if (origRelation->rd_rel->relkind == RELKIND_COMPOSITE_TYPE)
39743974
ereport(ERROR,
39753975
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
3976-
errmsg("cannot alter type \"%s\" because column \"%s\".\"%s\" uses it",
3976+
errmsg("cannot alter type \"%s\" because column \"%s.%s\" uses it",
39773977
RelationGetRelationName(origRelation),
39783978
RelationGetRelationName(rel),
39793979
NameStr(att->attname))));
39803980
else if (origRelation->rd_rel->relkind == RELKIND_FOREIGN_TABLE)
39813981
ereport(ERROR,
39823982
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
3983-
errmsg("cannot alter foreign table \"%s\" because column \"%s\".\"%s\" uses its rowtype",
3983+
errmsg("cannot alter foreign table \"%s\" because column \"%s.%s\" uses its row type",
39843984
RelationGetRelationName(origRelation),
39853985
RelationGetRelationName(rel),
39863986
NameStr(att->attname))));
39873987
else
39883988
ereport(ERROR,
39893989
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
3990-
errmsg("cannot alter table \"%s\" because column \"%s\".\"%s\" uses its rowtype",
3990+
errmsg("cannot alter table \"%s\" because column \"%s.%s\" uses its row type",
39913991
RelationGetRelationName(origRelation),
39923992
RelationGetRelationName(rel),
39933993
NameStr(att->attname))));
@@ -6648,7 +6648,7 @@ ATPrepAlterColumnType(List **wqueue,
66486648
* expression, else just take the old value and try to coerce it. We
66496649
* do this first so that type incompatibility can be detected before
66506650
* we waste effort, and because we need the expression to be parsed
6651-
* against the original table rowtype.
6651+
* against the original table row type.
66526652
*/
66536653
if (transform)
66546654
{
@@ -7493,7 +7493,7 @@ ATExecChangeOwner(Oid relationOid, Oid newOwnerId, bool recursing, LOCKMODE lock
74937493
newOwnerId);
74947494

74957495
/*
7496-
* Also change the ownership of the table's rowtype, if it has one
7496+
* Also change the ownership of the table's row type, if it has one
74977497
*/
74987498
if (tuple_class->relkind != RELKIND_INDEX)
74997499
AlterTypeOwnerInternal(tuple_class->reltype, newOwnerId,
@@ -9005,7 +9005,7 @@ AlterTableNamespace(RangeVar *relation, const char *newschema,
90059005

90069006
AlterRelationNamespaceInternal(classRel, relid, oldNspOid, nspOid, true);
90079007

9008-
/* Fix the table's rowtype too */
9008+
/* Fix the table's row type too */
90099009
AlterTypeNamespaceInternal(rel->rd_rel->reltype, nspOid, false, false);
90109010

90119011
/* Fix other dependent stuff */
@@ -9089,7 +9089,7 @@ AlterIndexNamespaces(Relation classRel, Relation rel,
90899089
/*
90909090
* Note: currently, the index will not have its own dependency on the
90919091
* namespace, so we don't need to do changeDependencyFor(). There's no
9092-
* rowtype in pg_type, either.
9092+
* row type in pg_type, either.
90939093
*/
90949094
AlterRelationNamespaceInternal(classRel, indexOid,
90959095
oldNspOid, newNspOid,

‎src/backend/parser/parse_utilcmd.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1481,21 +1481,21 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
14811481
ereport(ERROR,
14821482
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
14831483
errmsg("\"%s\" is not a unique index", index_name),
1484-
errdetail("Cannot create a PRIMARY KEY or UNIQUE constraint using such an index."),
1484+
errdetail("Cannot create a primary key or unique constraint using such an index."),
14851485
parser_errposition(cxt->pstate, constraint->location)));
14861486

14871487
if (RelationGetIndexExpressions(index_rel) != NIL)
14881488
ereport(ERROR,
14891489
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
14901490
errmsg("index \"%s\" contains expressions", index_name),
1491-
errdetail("Cannot create a PRIMARY KEY or UNIQUE constraint using such an index."),
1491+
errdetail("Cannot create a primary key or unique constraint using such an index."),
14921492
parser_errposition(cxt->pstate, constraint->location)));
14931493

14941494
if (RelationGetIndexPredicate(index_rel) != NIL)
14951495
ereport(ERROR,
14961496
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
14971497
errmsg("\"%s\" is a partial index", index_name),
1498-
errdetail("Cannot create a PRIMARY KEY or UNIQUE constraint using such an index."),
1498+
errdetail("Cannot create a primary key or unique constraint using such an index."),
14991499
parser_errposition(cxt->pstate, constraint->location)));
15001500

15011501
/*
@@ -1565,7 +1565,7 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
15651565
ereport(ERROR,
15661566
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
15671567
errmsg("index \"%s\" does not have default sorting behavior", index_name),
1568-
errdetail("Cannot create a PRIMARY KEY or UNIQUE constraint using such an index."),
1568+
errdetail("Cannot create a primary key or unique constraint using such an index."),
15691569
parser_errposition(cxt->pstate, constraint->location)));
15701570

15711571
constraint->keys = lappend(constraint->keys, makeString(attname));

‎src/backend/replication/syncrep.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
202202
* is not true: it's already committed locally. The former is no good
203203
* either: the client has requested synchronous replication, and is
204204
* entitled to assume that an acknowledged commit is also replicated,
205-
* which may not be true. So in this case we issue a WARNING (which
205+
* which might not be true. So in this case we issue a WARNING (which
206206
* some clients may be able to interpret) and shut off further output.
207207
* We do NOT reset ProcDiePending, so that the process will die after
208208
* the commit is cleaned up.
@@ -212,7 +212,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
212212
ereport(WARNING,
213213
(errcode(ERRCODE_ADMIN_SHUTDOWN),
214214
errmsg("canceling the wait for synchronous replication and terminating connection due to administrator command"),
215-
errdetail("The transaction has already committed locally, but may not have been replicated to the standby.")));
215+
errdetail("The transaction has already committed locally, but might not have been replicated to the standby.")));
216216
whereToSendOutput = DestNone;
217217
SyncRepCancelWait();
218218
break;
@@ -229,7 +229,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
229229
QueryCancelPending = false;
230230
ereport(WARNING,
231231
(errmsg("canceling wait for synchronous replication due to user request"),
232-
errdetail("The transaction has already committed locally, but may not have been replicated to the standby.")));
232+
errdetail("The transaction has already committed locally, but might not have been replicated to the standby.")));
233233
SyncRepCancelWait();
234234
break;
235235
}

‎src/backend/utils/misc/guc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2965,7 +2965,7 @@ static struct config_string ConfigureNamesString[] =
29652965

29662966
{
29672967
{"synchronous_standby_names", PGC_SIGHUP, WAL_REPLICATION,
2968-
gettext_noop("List of potential standby names to synchronise with."),
2968+
gettext_noop("List of potential standby names to synchronize with."),
29692969
NULL,
29702970
GUC_LIST_INPUT
29712971
},
@@ -8234,7 +8234,7 @@ check_temp_buffers(int *newval, void **extra, GucSource source)
82348234
*/
82358235
if (NLocBuffer && NLocBuffer != *newval)
82368236
{
8237-
GUC_check_errdetail("\"temp_buffers\" cannot be changed after any temp tables have been accessed in the session.");
8237+
GUC_check_errdetail("\"temp_buffers\" cannot be changed after any temporary tables have been accessed in the session.");
82388238
return false;
82398239
}
82408240
return true;

‎src/test/regress/expected/alter_table.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1509,7 +1509,7 @@ drop table another;
15091509
create table tab1 (a int, b text);
15101510
create table tab2 (x int, y tab1);
15111511
alter table tab1 alter column b type varchar; -- fails
1512-
ERROR: cannot alter table "tab1" because column "tab2"."y" uses its rowtype
1512+
ERROR: cannot alter table "tab1" because column "tab2.y" uses its row type
15131513
-- disallow recursive containment of row types
15141514
create temp table recur1 (f1 int);
15151515
alter table recur1 add column f2 recur1; -- fails
@@ -1845,7 +1845,7 @@ DROP TYPE test_type;
18451845
CREATE TYPE test_type1 AS (a int, b text);
18461846
CREATE TABLE test_tbl1 (x int, y test_type1);
18471847
ALTER TYPE test_type1 ALTER ATTRIBUTE b TYPE varchar; -- fails
1848-
ERROR: cannot alter type "test_type1" because column "test_tbl1"."y" uses it
1848+
ERROR: cannot alter type "test_type1" because column "test_tbl1.y" uses it
18491849
CREATE TYPE test_type2 AS (a int, b text);
18501850
CREATE TABLE test_tbl2 OF test_type2;
18511851
CREATE TABLE test_tbl2_subclass () INHERITS (test_tbl2);

‎src/test/regress/expected/domain.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,12 +510,12 @@ create type ddtest1 as (f1 posint);
510510
create table ddtest2(f1 ddtest1);
511511
insert into ddtest2 values(row(-1));
512512
alter domain posint add constraint c1 check(value >= 0);
513-
ERROR: cannot alter type "posint" because column "ddtest2"."f1" uses it
513+
ERROR: cannot alter type "posint" because column "ddtest2.f1" uses it
514514
drop table ddtest2;
515515
create table ddtest2(f1 ddtest1[]);
516516
insert into ddtest2 values('{(-1)}');
517517
alter domain posint add constraint c1 check(value >= 0);
518-
ERROR: cannot alter type "posint" because column "ddtest2"."f1" uses it
518+
ERROR: cannot alter type "posint" because column "ddtest2.f1" uses it
519519
drop table ddtest2;
520520
alter domain posint add constraint c1 check(value >= 0);
521521
create domain posint2 as posint check (value % 2 = 0);

‎src/test/regress/expected/foreign_data.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 SET DATA TYPE text;
701701
-- can't change the column type if it's used elsewhere
702702
CREATE TABLE use_ft1_column_type (x ft1);
703703
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 SET DATA TYPE integer; -- ERROR
704-
ERROR: cannot alter foreign table "ft1" because column "use_ft1_column_type"."x" uses its rowtype
704+
ERROR: cannot alter foreign table "ft1" because column "use_ft1_column_type.x" uses its row type
705705
DROP TABLE use_ft1_column_type;
706706
ALTER FOREIGN TABLE ft1 ADD CONSTRAINT ft1_c9_check CHECK (c9 < 0); -- ERROR
707707
ERROR: "ft1" is not a table

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy