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

Commit06f04b6

Browse files
committed
Message style tweaks
1 parent413ed25 commit06f04b6

File tree

9 files changed

+18
-17
lines changed

9 files changed

+18
-17
lines changed

‎src/backend/commands/tablecmds.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6751,7 +6751,8 @@ ATPrepAlterColumnType(List **wqueue,
67516751
elseif (transform)
67526752
ereport(ERROR,
67536753
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
6754-
errmsg("ALTER TYPE USING is only supported on plain tables")));
6754+
errmsg("\"%s\" is not a table",
6755+
RelationGetRelationName(rel))));
67556756

67566757
if (tab->relkind==RELKIND_COMPOSITE_TYPE||
67576758
tab->relkind==RELKIND_FOREIGN_TABLE)

‎src/backend/parser/parse_utilcmd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1524,7 +1524,7 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
15241524
if (index_rel->rd_rel->relam!=get_am_oid(DEFAULT_INDEX_TYPE, false))
15251525
ereport(ERROR,
15261526
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
1527-
errmsg("index \"%s\" is not ab-tree",index_name),
1527+
errmsg("index \"%s\" is not abtree",index_name),
15281528
parser_errposition(cxt->pstate,constraint->location)));
15291529

15301530
/* Must get indclass the hard way */

‎src/backend/port/win32/crashdump.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,15 @@ crashDumpHandler(struct _EXCEPTION_POINTERS * pExceptionInfo)
105105
hDll=LoadLibrary("dbghelp.dll");
106106
if (hDll==NULL)
107107
{
108-
write_stderr("could not load dbghelp.dll, cannot writecrashdump\n");
108+
write_stderr("could not load dbghelp.dll, cannot writecrash dump\n");
109109
returnEXCEPTION_CONTINUE_SEARCH;
110110
}
111111

112112
pDump= (MINIDUMPWRITEDUMP)GetProcAddress(hDll,"MiniDumpWriteDump");
113113

114114
if (pDump==NULL)
115115
{
116-
write_stderr("could not load required functions in dbghelp.dll, cannot writecrashdump\n");
116+
write_stderr("could not load required functions in dbghelp.dll, cannot writecrash dump\n");
117117
returnEXCEPTION_CONTINUE_SEARCH;
118118
}
119119

@@ -144,16 +144,16 @@ crashDumpHandler(struct _EXCEPTION_POINTERS * pExceptionInfo)
144144
NULL);
145145
if (dumpFile==INVALID_HANDLE_VALUE)
146146
{
147-
write_stderr("could not open crash dump file%s for writing: error code %u\n",
147+
write_stderr("could not open crash dump file\"%s\" for writing: error code %u\n",
148148
dumpPath, (unsignedint)GetLastError());
149149
returnEXCEPTION_CONTINUE_SEARCH;
150150
}
151151

152152
if ((*pDump) (selfProcHandle,selfPid,dumpFile,dumpType,&ExInfo,
153153
NULL,NULL))
154-
write_stderr("wrote crash dump to%s\n",dumpPath);
154+
write_stderr("wrote crash dump tofile \"%s\"\n",dumpPath);
155155
else
156-
write_stderr("could not write crash dump to%s: error code %08x\n",
156+
write_stderr("could not write crash dump tofile \"%s\": error code %08x\n",
157157
dumpPath, (unsignedint)GetLastError());
158158

159159
CloseHandle(dumpFile);

‎src/backend/storage/lmgr/predicate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,7 @@ OldSerXidAdd(TransactionId xid, SerCommitSeqNo minConflictCommitSeqNo)
882882
oldSerXidControl->warningIssued= true;
883883
ereport(WARNING,
884884
(errmsg("memory for serializable conflict tracking is nearly exhausted"),
885-
errhint("Theremay be an idle transaction or a forgotten prepared transaction causing this.")));
885+
errhint("Theremight be an idle transaction or a forgotten prepared transaction causing this.")));
886886
}
887887
}
888888

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3937,7 +3937,7 @@ text_format_string_conversion(StringInfo buf, char conversion,
39373937
elseif (conversion=='I')
39383938
ereport(ERROR,
39393939
(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
3940-
errmsg("NULLcannot beescaped as an SQL identifier")));
3940+
errmsg("null valuescannot beformatted as an SQL identifier")));
39413941
return;
39423942
}
39433943

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ static struct config_bool ConfigureNamesBool[] =
887887
},
888888
{
889889
{"restart_after_crash",PGC_SIGHUP,ERROR_HANDLING_OPTIONS,
890-
gettext_noop("Reinitialize after backend crash."),
890+
gettext_noop("Reinitializeserverafter backend crash."),
891891
NULL
892892
},
893893
&restart_after_crash,
@@ -1378,7 +1378,7 @@ static struct config_bool ConfigureNamesBool[] =
13781378

13791379
{
13801380
{"hot_standby_feedback",PGC_SIGHUP,WAL_STANDBY_SERVERS,
1381-
gettext_noop("Allows feedback from a hot standby primary that will avoid query conflicts."),
1381+
gettext_noop("Allows feedback from a hot standbyto theprimary that will avoid query conflicts."),
13821382
NULL
13831383
},
13841384
&hot_standby_feedback,
@@ -1567,7 +1567,7 @@ static struct config_int ConfigureNamesInt[] =
15671567

15681568
{
15691569
{"wal_receiver_status_interval",PGC_SIGHUP,WAL_STANDBY_SERVERS,
1570-
gettext_noop("Sets the maximum interval between WAL receiver status reports to themaster."),
1570+
gettext_noop("Sets the maximum interval between WAL receiver status reports to theprimary."),
15711571
NULL,
15721572
GUC_UNIT_S
15731573
},
@@ -2965,7 +2965,7 @@ static struct config_string ConfigureNamesString[] =
29652965

29662966
{
29672967
{"synchronous_standby_names",PGC_SIGHUP,WAL_REPLICATION,
2968-
gettext_noop("List ofpotential standbynamesto synchronize with."),
2968+
gettext_noop("List of namesof potential synchronous standbys."),
29692969
NULL,
29702970
GUC_LIST_INPUT
29712971
},

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,8 +694,8 @@ ALTER FOREIGN TABLE ft1 ALTER COLUMN c5 DROP DEFAULT; -- ERROR
694694
ERROR: "ft1" is not a table or view
695695
ALTER FOREIGN TABLE ft1 ALTER COLUMN c6 SET NOT NULL;
696696
ALTER FOREIGN TABLE ft1 ALTER COLUMN c7 DROP NOT NULL;
697-
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10)using '0'; -- ERROR
698-
ERROR:ALTER TYPE USINGisonly supported on plain tables
697+
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10)USING '0'; -- ERROR
698+
ERROR:"ft1"isnot a table
699699
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10);
700700
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 SET DATA TYPE text;
701701
-- can't change the column type if it's used elsewhere

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ select format('INSERT INTO %I VALUES(%L,%L)', 'mytab', NULL, 'Hello');
203203

204204
-- should fail, sql identifier cannot be NULL
205205
select format('INSERT INTO %I VALUES(%L,%L)', NULL, 10, 'Hello');
206-
ERROR:NULLcannot beescaped as an SQL identifier
206+
ERROR:null valuescannot beformatted as an SQL identifier
207207
-- check positional placeholders
208208
select format('%1$s %3$s', 1, 2, 3);
209209
format

‎src/test/regress/sql/foreign_data.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ ALTER FOREIGN TABLE ft1 ALTER COLUMN c4 SET DEFAULT 0; -- ERROR
294294
ALTER FOREIGN TABLE ft1 ALTER COLUMN c5 DROP DEFAULT;-- ERROR
295295
ALTER FOREIGN TABLE ft1 ALTER COLUMN c6SETNOT NULL;
296296
ALTER FOREIGN TABLE ft1 ALTER COLUMN c7 DROPNOT NULL;
297-
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPEchar(10)using'0';-- ERROR
297+
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPEchar(10)USING'0';-- ERROR
298298
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPEchar(10);
299299
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8SET DATA TYPEtext;
300300
-- can't change the column type if it's used elsewhere

0 commit comments

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