rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Message style fixes

This commit is contained in:
Alvaro Herrera 2019-04-30 10:00:38 -04:00
parent 9a83afecb7
commit 9f8b717a80
6 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/access/table/tableamapi.c
View File

@ -109,8 +109,8 @@ check_default_table_access_method(char **newval, void **extra, GucSource source)
if (strlen(*newval) >= NAMEDATALEN) if (strlen(*newval) >= NAMEDATALEN)
{ {
GUC_check_errdetail("default_table_access_method is too long (maximum %d characters).", GUC_check_errdetail("%s is too long (maximum %d characters).",
NAMEDATALEN - 1); "default_table_access_method", NAMEDATALEN - 1);
return false; return false;
} }
@ -131,7 +131,7 @@ check_default_table_access_method(char **newval, void **extra, GucSource source)
{ {
ereport(NOTICE, ereport(NOTICE,
(errcode(ERRCODE_UNDEFINED_OBJECT), (errcode(ERRCODE_UNDEFINED_OBJECT),
errmsg("Table access method \"%s\" does not exist", errmsg("table access method \"%s\" does not exist",
*newval))); *newval)));
} }
else else

4
src/backend/access/transam/twophase.c
View File

@ -2190,12 +2190,12 @@ ProcessTwoPhaseBuffer(TransactionId xid,
if (fromdisk) if (fromdisk)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATA_CORRUPTED), (errcode(ERRCODE_DATA_CORRUPTED),
errmsg("corrupted two-phase state file for transaction \"%u\"", errmsg("corrupted two-phase state file for transaction %u",
xid))); xid)));
else else
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATA_CORRUPTED), (errcode(ERRCODE_DATA_CORRUPTED),
errmsg("corrupted two-phase state in memory for transaction \"%u\"", errmsg("corrupted two-phase state in memory for transaction %u",
xid))); xid)));
} }

2
src/backend/commands/indexcmds.c
View File

@ -639,7 +639,7 @@ DefineIndex(Oid relationId,
if (partitioned && tablespaceId == MyDatabaseTableSpace) if (partitioned && tablespaceId == MyDatabaseTableSpace)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("cannot specify default tablespace for partitioned relation"))); errmsg("cannot specify default tablespace for partitioned relations")));
} }
else else
{ {

6
src/backend/commands/tablecmds.c
View File

@ -7689,12 +7689,14 @@ ATAddForeignKeyConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel,
fkconstraint->fk_upd_action == FKCONSTR_ACTION_CASCADE) fkconstraint->fk_upd_action == FKCONSTR_ACTION_CASCADE)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("invalid ON UPDATE action for foreign key constraint containing generated column"))); errmsg("invalid %s action for foreign key constraint containing generated column",
"ON UPDATE")));
if (fkconstraint->fk_del_action == FKCONSTR_ACTION_SETNULL || if (fkconstraint->fk_del_action == FKCONSTR_ACTION_SETNULL ||
fkconstraint->fk_del_action == FKCONSTR_ACTION_SETDEFAULT) fkconstraint->fk_del_action == FKCONSTR_ACTION_SETDEFAULT)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("invalid ON DELETE action for foreign key constraint containing generated column"))); errmsg("invalid %s action for foreign key constraint containing generated column",
"ON DELETE")));
} }
} }

4
src/backend/utils/misc/guc.c
View File

@ -11639,8 +11639,8 @@ check_recovery_target_name(char **newval, void **extra, GucSource source)
/* Use the value of newval directly */ /* Use the value of newval directly */
if (strlen(*newval) >= MAXFNAMELEN) if (strlen(*newval) >= MAXFNAMELEN)
{ {
GUC_check_errdetail("recovery_target_name is too long (maximum %d characters).", GUC_check_errdetail("%s is too long (maximum %d characters).",
MAXFNAMELEN - 1); "recovery_target_name", MAXFNAMELEN - 1);
return false; return false;
} }
return true; return true;

2
src/test/regress/output/tablespace.source
View File

@ -106,7 +106,7 @@ Tablespace: "regress_tblspace"
CREATE TABLE testschema.dflt (a int PRIMARY KEY) PARTITION BY LIST (a) TABLESPACE pg_default; CREATE TABLE testschema.dflt (a int PRIMARY KEY) PARTITION BY LIST (a) TABLESPACE pg_default;
ERROR: cannot specify default tablespace for partitioned relations ERROR: cannot specify default tablespace for partitioned relations
CREATE TABLE testschema.dflt (a int PRIMARY KEY USING INDEX TABLESPACE pg_default) PARTITION BY LIST (a); CREATE TABLE testschema.dflt (a int PRIMARY KEY USING INDEX TABLESPACE pg_default) PARTITION BY LIST (a);
ERROR: cannot specify default tablespace for partitioned relation ERROR: cannot specify default tablespace for partitioned relations
SET default_tablespace TO 'pg_default'; SET default_tablespace TO 'pg_default';
CREATE TABLE testschema.dflt (a int PRIMARY KEY) PARTITION BY LIST (a) TABLESPACE regress_tblspace; CREATE TABLE testschema.dflt (a int PRIMARY KEY) PARTITION BY LIST (a) TABLESPACE regress_tblspace;
ERROR: cannot specify default tablespace for partitioned relations ERROR: cannot specify default tablespace for partitioned relations