mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-28 21:01:48 +02:00
Message style and spelling improvements
This commit is contained in:
parent
ca59dfa6f7
commit
e2a0cb1a80
@ -714,7 +714,7 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate)
|
|||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errmsg("index \"%s\" contains an inner tuple marked as invalid",
|
(errmsg("index \"%s\" contains an inner tuple marked as invalid",
|
||||||
RelationGetRelationName(r)),
|
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.")));
|
errhint("Please REINDEX it.")));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -270,7 +270,7 @@ gistbulkdelete(PG_FUNCTION_ARGS)
|
|||||||
ereport(LOG,
|
ereport(LOG,
|
||||||
(errmsg("index \"%s\" contains an inner tuple marked as invalid",
|
(errmsg("index \"%s\" contains an inner tuple marked as invalid",
|
||||||
RelationGetRelationName(rel)),
|
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.")));
|
errhint("Please REINDEX it.")));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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 *
|
static char *
|
||||||
read_extension_script_file(const ExtensionControlFile *control,
|
read_extension_script_file(const ExtensionControlFile *control,
|
||||||
@ -2099,7 +2099,7 @@ pg_extension_config_dump(PG_FUNCTION_ARGS)
|
|||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
|
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
|
||||||
errmsg("pg_extension_config_dump() can only be called "
|
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
|
* Check that the table exists and is a member of the extension being
|
||||||
|
@ -3966,28 +3966,28 @@ find_composite_type_dependencies(Oid typeOid, Relation origRelation,
|
|||||||
if (origTypeName)
|
if (origTypeName)
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
|
(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,
|
origTypeName,
|
||||||
RelationGetRelationName(rel),
|
RelationGetRelationName(rel),
|
||||||
NameStr(att->attname))));
|
NameStr(att->attname))));
|
||||||
else if (origRelation->rd_rel->relkind == RELKIND_COMPOSITE_TYPE)
|
else if (origRelation->rd_rel->relkind == RELKIND_COMPOSITE_TYPE)
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
|
(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(origRelation),
|
||||||
RelationGetRelationName(rel),
|
RelationGetRelationName(rel),
|
||||||
NameStr(att->attname))));
|
NameStr(att->attname))));
|
||||||
else if (origRelation->rd_rel->relkind == RELKIND_FOREIGN_TABLE)
|
else if (origRelation->rd_rel->relkind == RELKIND_FOREIGN_TABLE)
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
|
(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(origRelation),
|
||||||
RelationGetRelationName(rel),
|
RelationGetRelationName(rel),
|
||||||
NameStr(att->attname))));
|
NameStr(att->attname))));
|
||||||
else
|
else
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
|
(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(origRelation),
|
||||||
RelationGetRelationName(rel),
|
RelationGetRelationName(rel),
|
||||||
NameStr(att->attname))));
|
NameStr(att->attname))));
|
||||||
@ -6648,7 +6648,7 @@ ATPrepAlterColumnType(List **wqueue,
|
|||||||
* expression, else just take the old value and try to coerce it. We
|
* expression, else just take the old value and try to coerce it. We
|
||||||
* do this first so that type incompatibility can be detected before
|
* do this first so that type incompatibility can be detected before
|
||||||
* we waste effort, and because we need the expression to be parsed
|
* 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)
|
if (transform)
|
||||||
{
|
{
|
||||||
@ -7493,7 +7493,7 @@ ATExecChangeOwner(Oid relationOid, Oid newOwnerId, bool recursing, LOCKMODE lock
|
|||||||
newOwnerId);
|
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)
|
if (tuple_class->relkind != RELKIND_INDEX)
|
||||||
AlterTypeOwnerInternal(tuple_class->reltype, newOwnerId,
|
AlterTypeOwnerInternal(tuple_class->reltype, newOwnerId,
|
||||||
@ -9005,7 +9005,7 @@ AlterTableNamespace(RangeVar *relation, const char *newschema,
|
|||||||
|
|
||||||
AlterRelationNamespaceInternal(classRel, relid, oldNspOid, nspOid, true);
|
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);
|
AlterTypeNamespaceInternal(rel->rd_rel->reltype, nspOid, false, false);
|
||||||
|
|
||||||
/* Fix other dependent stuff */
|
/* 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
|
* Note: currently, the index will not have its own dependency on the
|
||||||
* namespace, so we don't need to do changeDependencyFor(). There's no
|
* 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,
|
AlterRelationNamespaceInternal(classRel, indexOid,
|
||||||
oldNspOid, newNspOid,
|
oldNspOid, newNspOid,
|
||||||
|
@ -1481,21 +1481,21 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
|
|||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
||||||
errmsg("\"%s\" is not a unique index", index_name),
|
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)));
|
parser_errposition(cxt->pstate, constraint->location)));
|
||||||
|
|
||||||
if (RelationGetIndexExpressions(index_rel) != NIL)
|
if (RelationGetIndexExpressions(index_rel) != NIL)
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
||||||
errmsg("index \"%s\" contains expressions", index_name),
|
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)));
|
parser_errposition(cxt->pstate, constraint->location)));
|
||||||
|
|
||||||
if (RelationGetIndexPredicate(index_rel) != NIL)
|
if (RelationGetIndexPredicate(index_rel) != NIL)
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
||||||
errmsg("\"%s\" is a partial index", index_name),
|
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)));
|
parser_errposition(cxt->pstate, constraint->location)));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -1565,7 +1565,7 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
|
|||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
||||||
errmsg("index \"%s\" does not have default sorting behavior", index_name),
|
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)));
|
parser_errposition(cxt->pstate, constraint->location)));
|
||||||
|
|
||||||
constraint->keys = lappend(constraint->keys, makeString(attname));
|
constraint->keys = lappend(constraint->keys, makeString(attname));
|
||||||
|
@ -202,7 +202,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
|
|||||||
* is not true: it's already committed locally. The former is no good
|
* is not true: it's already committed locally. The former is no good
|
||||||
* either: the client has requested synchronous replication, and is
|
* either: the client has requested synchronous replication, and is
|
||||||
* entitled to assume that an acknowledged commit is also replicated,
|
* 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.
|
* some clients may be able to interpret) and shut off further output.
|
||||||
* We do NOT reset ProcDiePending, so that the process will die after
|
* We do NOT reset ProcDiePending, so that the process will die after
|
||||||
* the commit is cleaned up.
|
* the commit is cleaned up.
|
||||||
@ -212,7 +212,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
|
|||||||
ereport(WARNING,
|
ereport(WARNING,
|
||||||
(errcode(ERRCODE_ADMIN_SHUTDOWN),
|
(errcode(ERRCODE_ADMIN_SHUTDOWN),
|
||||||
errmsg("canceling the wait for synchronous replication and terminating connection due to administrator command"),
|
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;
|
whereToSendOutput = DestNone;
|
||||||
SyncRepCancelWait();
|
SyncRepCancelWait();
|
||||||
break;
|
break;
|
||||||
@ -229,7 +229,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
|
|||||||
QueryCancelPending = false;
|
QueryCancelPending = false;
|
||||||
ereport(WARNING,
|
ereport(WARNING,
|
||||||
(errmsg("canceling wait for synchronous replication due to user request"),
|
(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();
|
SyncRepCancelWait();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -2965,7 +2965,7 @@ static struct config_string ConfigureNamesString[] =
|
|||||||
|
|
||||||
{
|
{
|
||||||
{"synchronous_standby_names", PGC_SIGHUP, WAL_REPLICATION,
|
{"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,
|
NULL,
|
||||||
GUC_LIST_INPUT
|
GUC_LIST_INPUT
|
||||||
},
|
},
|
||||||
@ -8234,7 +8234,7 @@ check_temp_buffers(int *newval, void **extra, GucSource source)
|
|||||||
*/
|
*/
|
||||||
if (NLocBuffer && NLocBuffer != *newval)
|
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 false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
@ -1509,7 +1509,7 @@ drop table another;
|
|||||||
create table tab1 (a int, b text);
|
create table tab1 (a int, b text);
|
||||||
create table tab2 (x int, y tab1);
|
create table tab2 (x int, y tab1);
|
||||||
alter table tab1 alter column b type varchar; -- fails
|
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
|
-- disallow recursive containment of row types
|
||||||
create temp table recur1 (f1 int);
|
create temp table recur1 (f1 int);
|
||||||
alter table recur1 add column f2 recur1; -- fails
|
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 TYPE test_type1 AS (a int, b text);
|
||||||
CREATE TABLE test_tbl1 (x int, y test_type1);
|
CREATE TABLE test_tbl1 (x int, y test_type1);
|
||||||
ALTER TYPE test_type1 ALTER ATTRIBUTE b TYPE varchar; -- fails
|
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 TYPE test_type2 AS (a int, b text);
|
||||||
CREATE TABLE test_tbl2 OF test_type2;
|
CREATE TABLE test_tbl2 OF test_type2;
|
||||||
CREATE TABLE test_tbl2_subclass () INHERITS (test_tbl2);
|
CREATE TABLE test_tbl2_subclass () INHERITS (test_tbl2);
|
||||||
|
@ -510,12 +510,12 @@ create type ddtest1 as (f1 posint);
|
|||||||
create table ddtest2(f1 ddtest1);
|
create table ddtest2(f1 ddtest1);
|
||||||
insert into ddtest2 values(row(-1));
|
insert into ddtest2 values(row(-1));
|
||||||
alter domain posint add constraint c1 check(value >= 0);
|
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;
|
drop table ddtest2;
|
||||||
create table ddtest2(f1 ddtest1[]);
|
create table ddtest2(f1 ddtest1[]);
|
||||||
insert into ddtest2 values('{(-1)}');
|
insert into ddtest2 values('{(-1)}');
|
||||||
alter domain posint add constraint c1 check(value >= 0);
|
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;
|
drop table ddtest2;
|
||||||
alter domain posint add constraint c1 check(value >= 0);
|
alter domain posint add constraint c1 check(value >= 0);
|
||||||
create domain posint2 as posint check (value % 2 = 0);
|
create domain posint2 as posint check (value % 2 = 0);
|
||||||
|
@ -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
|
-- can't change the column type if it's used elsewhere
|
||||||
CREATE TABLE use_ft1_column_type (x ft1);
|
CREATE TABLE use_ft1_column_type (x ft1);
|
||||||
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 SET DATA TYPE integer; -- ERROR
|
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;
|
DROP TABLE use_ft1_column_type;
|
||||||
ALTER FOREIGN TABLE ft1 ADD CONSTRAINT ft1_c9_check CHECK (c9 < 0); -- ERROR
|
ALTER FOREIGN TABLE ft1 ADD CONSTRAINT ft1_c9_check CHECK (c9 < 0); -- ERROR
|
||||||
ERROR: "ft1" is not a table
|
ERROR: "ft1" is not a table
|
||||||
|
@ -84,7 +84,7 @@ select * from people;
|
|||||||
|
|
||||||
-- at the moment this will not work due to ALTER TABLE inadequacy:
|
-- at the moment this will not work due to ALTER TABLE inadequacy:
|
||||||
alter table fullname add column suffix text default '';
|
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:
|
-- but this should work:
|
||||||
alter table fullname add column suffix text default null;
|
alter table fullname add column suffix text default null;
|
||||||
select * from people;
|
select * from people;
|
||||||
|
Loading…
Reference in New Issue
Block a user