Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 5c6d2a5

Browse files
peterepetere
committed
Message style and wording fixes
1 parent df7cc39 commit 5c6d2a5

File tree

9 files changed

+21
-21
lines changed

9 files changed

+21
-21
lines changed

‎src/backend/access/gin/ginbulk.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ ginCombineData(RBNode *existing, const RBNode *newdata, void *arg)
4242
ereport(ERROR,
4343
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
4444
errmsg("posting list is too long"),
45-
errhint("Reduce maintenance_work_mem")));
45+
errhint("Reduce maintenance_work_mem.")));
4646

4747
accum->allocatedMemory -= GetMemoryChunkSpace(eo->list);
4848
eo->maxcount *= 2;

‎src/backend/access/transam/xlogfuncs.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ pg_stop_backup(PG_FUNCTION_ARGS)
153153
ereport(ERROR,
154154
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
155155
errmsg("non-exclusive backup in progress"),
156-
errhint("did you mean to use pg_stop_backup('f')?")));
156+
errhint("Did you mean to use pg_stop_backup('f')?")));
157157

158158
/*
159159
* Exclusive backups were typically started in a different connection,
@@ -227,7 +227,7 @@ pg_stop_backup_v2(PG_FUNCTION_ARGS)
227227
ereport(ERROR,
228228
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
229229
errmsg("non-exclusive backup in progress"),
230-
errhint("did you mean to use pg_stop_backup('f')?")));
230+
errhint("Did you mean to use pg_stop_backup('f')?")));
231231

232232
/*
233233
* Stop the exclusive backup, and since we're in an exclusive backup
@@ -245,7 +245,7 @@ pg_stop_backup_v2(PG_FUNCTION_ARGS)
245245
ereport(ERROR,
246246
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
247247
errmsg("non-exclusive backup is not in progress"),
248-
errhint("did you mean to use pg_stop_backup('t')?")));
248+
errhint("Did you mean to use pg_stop_backup('t')?")));
249249

250250
/*
251251
* Stop the non-exclusive backup. Return a copy of the backup

‎src/backend/commands/aggregatecmds.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ DefineAggregate(List *name, List *args, bool oldstyle, List *parameters,
344344
if (transTypeId != INTERNALOID)
345345
ereport(ERROR,
346346
(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
347-
errmsg("a serialization type must only be specified when the aggregate transition data type is \"%s\"",
347+
errmsg("a serialization type must only be specified when the aggregate transition data type is %s",
348348
format_type_be(INTERNALOID))));
349349

350350
serialTypeId = typenameTypeId(NULL, serialType);
@@ -366,7 +366,7 @@ DefineAggregate(List *name, List *args, bool oldstyle, List *parameters,
366366
if (serialTypeId == INTERNALOID)
367367
ereport(ERROR,
368368
(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
369-
errmsg("aggregate serialization type cannot be \"%s\"",
369+
errmsg("aggregate serialization data type cannot be %s",
370370
format_type_be(serialTypeId))));
371371

372372
/*

‎src/backend/commands/operatorcmds.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ AlterOperator(AlterOperatorStmt *stmt)
448448
{
449449
ereport(ERROR,
450450
(errcode(ERRCODE_SYNTAX_ERROR),
451-
errmsg("operator attribute \"%s\" can not be changed",
451+
errmsg("operator attribute \"%s\" cannot be changed",
452452
defel->defname)));
453453
}
454454
else

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -849,13 +849,13 @@ parse_ident(PG_FUNCTION_ARGS)
849849
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
850850
errmsg("string is not a valid identifier: \"%s\"",
851851
text_to_cstring(qualname)),
852-
errdetail("No valid identifier before \".\" symbol.")));
852+
errdetail("No valid identifier before \".\".")));
853853
else if (after_dot)
854854
ereport(ERROR,
855855
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
856856
errmsg("string is not a valid identifier: \"%s\"",
857857
text_to_cstring(qualname)),
858-
errdetail("No valid identifier after \".\" symbol.")));
858+
errdetail("No valid identifier after \".\".")));
859859
else
860860
ereport(ERROR,
861861
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),

‎src/bin/pg_rewind/pg_rewind.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ getTimelineHistory(ControlFileData *controlFile, int *nentries)
459459
else if (controlFile == &ControlFile_target)
460460
histfile = slurpFile(datadir_target, path, NULL);
461461
else
462-
pg_fatal("Invalid control file");
462+
pg_fatal("invalid control file");
463463

464464
history = rewind_parseTimeLineHistory(histfile, tli, nentries);
465465
pg_free(histfile);
@@ -685,7 +685,7 @@ syncTargetDirectory(const char *argv0)
685685
strlcpy(full_path, progname, sizeof(full_path));
686686

687687
if (ret == -1)
688-
pg_fatal("The program \"initdb\" is needed by %s but was \n"
688+
pg_fatal("The program \"initdb\" is needed by %s but was\n"
689689
"not found in the same directory as \"%s\".\n"
690690
"Check your installation.\n", progname, full_path);
691691
else

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -110,17 +110,17 @@ ORDER BY 1;
110110
-- Test invalid options.
111111
--
112112
ALTER OPERATOR === (boolean, boolean) SET (COMMUTATOR = ====);
113-
ERROR: operator attribute "commutator" can not be changed
113+
ERROR: operator attribute "commutator" cannot be changed
114114
ALTER OPERATOR === (boolean, boolean) SET (NEGATOR = ====);
115-
ERROR: operator attribute "negator" can not be changed
115+
ERROR: operator attribute "negator" cannot be changed
116116
ALTER OPERATOR === (boolean, boolean) SET (RESTRICT = non_existent_func);
117117
ERROR: function non_existent_func(internal, oid, internal, integer) does not exist
118118
ALTER OPERATOR === (boolean, boolean) SET (JOIN = non_existent_func);
119119
ERROR: function non_existent_func(internal, oid, internal, smallint, internal) does not exist
120120
ALTER OPERATOR === (boolean, boolean) SET (COMMUTATOR = !==);
121-
ERROR: operator attribute "commutator" can not be changed
121+
ERROR: operator attribute "commutator" cannot be changed
122122
ALTER OPERATOR === (boolean, boolean) SET (NEGATOR = !==);
123-
ERROR: operator attribute "negator" can not be changed
123+
ERROR: operator attribute "negator" cannot be changed
124124
--
125125
-- Test permission check. Must be owner to ALTER OPERATOR.
126126
--

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ CREATE AGGREGATE myavg (numeric)
109109
sfunc = numeric_avg_accum,
110110
serialtype = internal
111111
);
112-
ERROR: aggregate serialization type cannot be "internal"
112+
ERROR: aggregate serialization data type cannot be internal
113113
-- if serialtype is specified we need a serialfunc and deserialfunc
114114
CREATE AGGREGATE myavg (numeric)
115115
(

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,10 @@ SELECT parse_ident(' ');
154154
ERROR: string is not a valid identifier: " "
155155
SELECT parse_ident(' .aaa');
156156
ERROR: string is not a valid identifier: " .aaa"
157-
DETAIL: No valid identifier before "." symbol.
157+
DETAIL: No valid identifier before ".".
158158
SELECT parse_ident(' aaa . ');
159159
ERROR: string is not a valid identifier: " aaa . "
160-
DETAIL: No valid identifier after "." symbol.
160+
DETAIL: No valid identifier after ".".
161161
SELECT parse_ident('aaa.a%b');
162162
ERROR: string is not a valid identifier: "aaa.a%b"
163163
SELECT parse_ident(E'X\rXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX');
@@ -188,10 +188,10 @@ SELECT parse_ident('10.20');
188188
ERROR: string is not a valid identifier: "10.20"
189189
SELECT parse_ident('.');
190190
ERROR: string is not a valid identifier: "."
191-
DETAIL: No valid identifier before "." symbol.
191+
DETAIL: No valid identifier before ".".
192192
SELECT parse_ident('.1020');
193193
ERROR: string is not a valid identifier: ".1020"
194-
DETAIL: No valid identifier before "." symbol.
194+
DETAIL: No valid identifier before ".".
195195
SELECT parse_ident('xxx.1020');
196196
ERROR: string is not a valid identifier: "xxx.1020"
197-
DETAIL: No valid identifier after "." symbol.
197+
DETAIL: No valid identifier after ".".

0 commit comments

Comments
 (0)