Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7438af9

Browse files
committed
More message editing, some suggested by Alvaro Herrera
1 parent8b51083 commit7438af9

File tree

26 files changed

+109
-114
lines changed

26 files changed

+109
-114
lines changed

‎src/backend/catalog/index.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.218 2003/09/25 06:57:57 petere Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.219 2003/09/29 00:05:24 petere Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -1656,7 +1656,7 @@ reindex_index(Oid indexId)
16561656
if (inplace&&IsUnderPostmaster)
16571657
ereport(ERROR,
16581658
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
1659-
errmsg("shared index \"%s\" can only be reindexed instandalone mode",
1659+
errmsg("shared index \"%s\" can only be reindexed instand-alone mode",
16601660
RelationGetRelationName(iRel))));
16611661

16621662
/* Fetch info needed for index_build */

‎src/backend/catalog/pg_proc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.107 2003/09/26 15:27:26 petere Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.108 2003/09/29 00:05:24 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -533,7 +533,7 @@ check_sql_fn_retval(Oid rettype, char fn_typtype, List *queryTreeList)
533533
ereport(ERROR,
534534
(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
535535
errmsg("cannot determine result data type"),
536-
errdetail("A function returningANYARRAY orANYELEMENT must have at least one argument of either type.")));
536+
errdetail("A function returning\"anyarray\" or\"anyelement\" must have at least one argument of either type.")));
537537
}
538538
else
539539
ereport(ERROR,

‎src/backend/commands/dbcommands.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.123 2003/09/25 06:57:58 petere Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.124 2003/09/29 00:05:24 petere Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -200,7 +200,7 @@ createdb(const CreatedbStmt *stmt)
200200
if (dbpath!=NULL)
201201
ereport(ERROR,
202202
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
203-
errmsg("cannot use analternate location on this platform")));
203+
errmsg("cannot use analternative location on this platform")));
204204
#endif
205205

206206
/*

‎src/backend/commands/functioncmds.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/commands/functioncmds.c,v 1.36 2003/09/25 06:57:58 petere Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/commands/functioncmds.c,v 1.37 2003/09/29 00:05:24 petere Exp $
1313
*
1414
* DESCRIPTION
1515
* These routines take the parse tree and pick out the
@@ -441,13 +441,8 @@ CreateFunction(CreateFunctionStmt *stmt)
441441
errmsg("language \"%s\" does not exist",languageName),
442442
(strcmp(languageName,"plperl")==0||
443443
strcmp(languageName,"plperlu")==0||
444-
strcmp(languageName,"plphp")==0||
445444
strcmp(languageName,"plpgsql")==0||
446-
strcmp(languageName,"plpython")==0||
447445
strcmp(languageName,"plpythonu")==0||
448-
strcmp(languageName,"plr")==0||
449-
strcmp(languageName,"plruby")==0||
450-
strcmp(languageName,"plsh")==0||
451446
strcmp(languageName,"pltcl")==0||
452447
strcmp(languageName,"pltclu")==0) ?
453448
errhint("You need to use \"createlang\" to load the language into the database.") :0));
@@ -948,7 +943,7 @@ CreateCast(CreateCastStmt *stmt)
948943
typ1align!=typ2align)
949944
ereport(ERROR,
950945
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
951-
errmsg("source and targetdatatypes are not physically compatible")));
946+
errmsg("source and targetdata types are not physically compatible")));
952947
}
953948

954949
/* convert CoercionContext enum to char value for castcontext */

‎src/backend/commands/indexcmds.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.111 2003/09/26 15:27:31 petere Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.112 2003/09/29 00:05:24 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -648,7 +648,7 @@ ReindexTable(RangeVar *relation, bool force /* currently unused */ )
648648
if (((Form_pg_class)GETSTRUCT(tuple))->relisshared&&IsUnderPostmaster)
649649
ereport(ERROR,
650650
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
651-
errmsg("shared table \"%s\" can only be reindexed instandalone mode",
651+
errmsg("shared table \"%s\" can only be reindexed instand-alone mode",
652652
relation->relname)));
653653

654654
ReleaseSysCache(tuple);

‎src/backend/commands/tablecmds.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.83 2003/09/25 06:57:58 petere Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.84 2003/09/29 00:05:25 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -4075,7 +4075,7 @@ AlterTableCreateToastTable(Oid relOid, bool silent)
40754075
if (shared_relation&&IsUnderPostmaster)
40764076
ereport(ERROR,
40774077
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
4078-
errmsg("sharedrelations cannot be toasted after initdb")));
4078+
errmsg("sharedtables cannot be toasted after initdb")));
40794079

40804080
/*
40814081
* Is it already toasted?
@@ -4090,7 +4090,7 @@ AlterTableCreateToastTable(Oid relOid, bool silent)
40904090

40914091
ereport(ERROR,
40924092
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
4093-
errmsg("relation \"%s\" already has a TOAST table",
4093+
errmsg("tables \"%s\" already has a TOAST table",
40944094
RelationGetRelationName(rel))));
40954095
}
40964096

@@ -4107,7 +4107,7 @@ AlterTableCreateToastTable(Oid relOid, bool silent)
41074107

41084108
ereport(ERROR,
41094109
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
4110-
errmsg("relation \"%s\" does not need a TOAST table",
4110+
errmsg("table \"%s\" does not need a TOAST table",
41114111
RelationGetRelationName(rel))));
41124112
}
41134113

‎src/backend/commands/typecmds.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/commands/typecmds.c,v 1.46 2003/09/25 06:57:58 petere Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/commands/typecmds.c,v 1.47 2003/09/29 00:05:25 petere Exp $
1212
*
1313
* DESCRIPTION
1414
* The "DefineFoo" routines take the parse tree and pick out the
@@ -1554,9 +1554,9 @@ AlterDomainAddConstraint(List *names, Node *newConstraint)
15541554
if (!isNull&& !DatumGetBool(conResult))
15551555
ereport(ERROR,
15561556
(errcode(ERRCODE_CHECK_VIOLATION),
1557-
errmsg("relation \"%s\"column \"%s\" contains values that violate the new constraint",
1558-
RelationGetRelationName(testrel),
1559-
NameStr(tupdesc->attrs[attnum-1]->attname))));
1557+
errmsg("column \"%s\"of table \"%s\" contains values that violate the new constraint",
1558+
NameStr(tupdesc->attrs[attnum-1]->attname),
1559+
RelationGetRelationName(testrel))));
15601560
}
15611561

15621562
ResetExprContext(econtext);

‎src/backend/commands/user.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.126 2003/09/25 06:57:59 petere Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.127 2003/09/29 00:05:25 petere Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -1227,7 +1227,7 @@ CheckPgUserAclNotNull(void)
12271227
if (heap_attisnull(htup,Anum_pg_class_relacl))
12281228
ereport(ERROR,
12291229
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
1230-
errmsg("before using passwords you must revokepermissions on %s",
1230+
errmsg("before using passwords you must revokeprivileges on %s",
12311231
ShadowRelationName),
12321232
errdetail("This restriction is to prevent unprivileged users from reading the passwords."),
12331233
errhint("Try REVOKE ALL ON \"%s\" FROM PUBLIC.",

‎src/backend/commands/vacuum.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*
1414
*
1515
* IDENTIFICATION
16-
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.261 2003/09/25 06:57:59 petere Exp $
16+
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.262 2003/09/29 00:05:25 petere Exp $
1717
*
1818
*-------------------------------------------------------------------------
1919
*/
@@ -2726,7 +2726,7 @@ vacuum_index(VacPageList vacpagelist, Relation indrel,
27262726
if (stats->num_index_tuples>num_tuples+keep_tuples||
27272727
!vac_is_partial_index(indrel))
27282728
ereport(WARNING,
2729-
(errmsg("index \"%s\" contains %.0f row versions, but table contains %.0ftuples",
2729+
(errmsg("index \"%s\" contains %.0f row versions, but table contains %.0frow versions",
27302730
RelationGetRelationName(indrel),
27312731
stats->num_index_tuples,num_tuples+keep_tuples),
27322732
errhint("Rebuild the index with REINDEX.")));

‎src/backend/parser/parse_coerce.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.110 2003/09/25 06:58:01 petere Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.111 2003/09/29 00:05:25 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -960,7 +960,7 @@ enforce_generic_type_consistency(Oid *actual_arg_types,
960960
if (!OidIsValid(array_typelem))
961961
ereport(ERROR,
962962
(errcode(ERRCODE_DATATYPE_MISMATCH),
963-
errmsg("argument declared \"anyarray\" is not an array but %s",
963+
errmsg("argument declared \"anyarray\" is not an array buttype%s",
964964
format_type_be(array_typeid))));
965965
}
966966

‎src/backend/parser/parse_func.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.160 2003/09/25 06:58:01 petere Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.161 2003/09/29 00:05:25 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -221,7 +221,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
221221
else
222222
ereport(ERROR,
223223
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
224-
errmsg("cannot pass result of subquery or join%s to a function",
224+
errmsg("cannot pass result of subquery or join\"%s\" to a function",
225225
relname)));
226226
toid=InvalidOid;/* keep compiler quiet */
227227
break;

‎src/backend/port/sysv_shmem.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Portions Copyright (c) 1994, Regents of the University of California
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/port/sysv_shmem.c,v 1.16 2003/09/26 15:27:35 petere Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/port/sysv_shmem.c,v 1.17 2003/09/29 00:05:25 petere Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -96,9 +96,9 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, uint32 size)
9696
(errno==EINVAL) ?
9797
errhint("This error usually means that PostgreSQL's request for a shared memory "
9898
"segment exceeded your kernel's SHMMAX parameter. You can either "
99-
"reduce the request size or reconfigure the kernel with larger SHMMAX. "
100-
"To reduce the request size (currently %u bytes), reduce "
101-
"PostgreSQL's shared_buffers parameter (currently %d) and/or "
99+
"reduce the request size or reconfigure the kernel with larger SHMMAX."
100+
"To reduce the request size (currently %u bytes), reduce "
101+
"PostgreSQL's shared_buffers parameter (currently %d) and/or "
102102
"its max_connections parameter (currently %d).\n"
103103
"If the request size is already small, it's possible that it is less than "
104104
"your kernel's SHMMIN parameter, in which case raising the request size or "

‎src/backend/rewrite/rewriteDefine.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.89 2003/09/26 15:27:36 petere Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.90 2003/09/29 00:05:25 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -262,7 +262,7 @@ DefineQueryRewrite(RuleStmt *stmt)
262262
if (length(action)>1)
263263
ereport(ERROR,
264264
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
265-
errmsg("multipleactionrules onselect are not implemented")));
265+
errmsg("multipleactions forrules onSELECT are not implemented")));
266266

267267
/*
268268
* ... the one action must be a SELECT, ...

‎src/backend/storage/freespace/freespace.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/storage/freespace/freespace.c,v 1.22 2003/09/25 06:58:02 petere Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/storage/freespace/freespace.c,v 1.23 2003/09/29 00:05:25 petere Exp $
1212
*
1313
*
1414
* NOTES:
@@ -704,7 +704,7 @@ PrintFreeSpaceMapStatistics(int elevel)
704704
ereport(elevel,
705705
(errmsg("free space map: %d relations, %d pages stored; %.0f total pages needed",
706706
numRels,storedPages,needed),
707-
errdetail("Allocated FSM size: %d relations + %d pages = %.0f kB sharedmem.",
707+
errdetail("Allocated FSM size: %d relations + %d pages = %.0f kB sharedmemory.",
708708
MaxFSMRelations,MaxFSMPages,
709709
(double)FreeSpaceShmemSize() /1024.0)));
710710
}

‎src/backend/storage/page/bufpage.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.55 2003/08/04 02:40:03 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.56 2003/09/29 00:05:25 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -489,7 +489,7 @@ PageIndexTupleDelete(Page page, OffsetNumber offnum)
489489
offset!=MAXALIGN(offset)||size!=MAXALIGN(size))
490490
ereport(ERROR,
491491
(errcode(ERRCODE_DATA_CORRUPTED),
492-
errmsg("corrupted item pointer: offset = %u size = %u",
492+
errmsg("corrupted item pointer: offset = %u, size = %u",
493493
offset, (unsignedint)size)));
494494

495495
/*

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp