mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-28 21:01:48 +02:00
Message style tweaks
This commit is contained in:
parent
d479a0f92f
commit
27af66162b
@ -6924,7 +6924,8 @@ ATPrepAlterColumnType(List **wqueue,
|
||||
else if (transform)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
||||
errmsg("ALTER TYPE USING is only supported on plain tables")));
|
||||
errmsg("\"%s\" is not a table",
|
||||
RelationGetRelationName(rel))));
|
||||
|
||||
if (tab->relkind == RELKIND_COMPOSITE_TYPE ||
|
||||
tab->relkind == RELKIND_FOREIGN_TABLE)
|
||||
|
@ -1531,7 +1531,7 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
|
||||
if (index_rel->rd_rel->relam != get_am_oid(DEFAULT_INDEX_TYPE, false))
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
||||
errmsg("index \"%s\" is not a b-tree", index_name),
|
||||
errmsg("index \"%s\" is not a btree", index_name),
|
||||
parser_errposition(cxt->pstate, constraint->location)));
|
||||
|
||||
/* Must get indclass the hard way */
|
||||
|
@ -105,7 +105,7 @@ crashDumpHandler(struct _EXCEPTION_POINTERS * pExceptionInfo)
|
||||
hDll = LoadLibrary("dbghelp.dll");
|
||||
if (hDll == NULL)
|
||||
{
|
||||
write_stderr("could not load dbghelp.dll, cannot write crashdump\n");
|
||||
write_stderr("could not load dbghelp.dll, cannot write crash dump\n");
|
||||
return EXCEPTION_CONTINUE_SEARCH;
|
||||
}
|
||||
|
||||
@ -113,7 +113,7 @@ crashDumpHandler(struct _EXCEPTION_POINTERS * pExceptionInfo)
|
||||
|
||||
if (pDump == NULL)
|
||||
{
|
||||
write_stderr("could not load required functions in dbghelp.dll, cannot write crashdump\n");
|
||||
write_stderr("could not load required functions in dbghelp.dll, cannot write crash dump\n");
|
||||
return EXCEPTION_CONTINUE_SEARCH;
|
||||
}
|
||||
|
||||
@ -144,16 +144,16 @@ crashDumpHandler(struct _EXCEPTION_POINTERS * pExceptionInfo)
|
||||
NULL);
|
||||
if (dumpFile == INVALID_HANDLE_VALUE)
|
||||
{
|
||||
write_stderr("could not open crash dump file %s for writing: error code %u\n",
|
||||
write_stderr("could not open crash dump file \"%s\" for writing: error code %u\n",
|
||||
dumpPath, (unsigned int) GetLastError());
|
||||
return EXCEPTION_CONTINUE_SEARCH;
|
||||
}
|
||||
|
||||
if ((*pDump) (selfProcHandle, selfPid, dumpFile, dumpType, &ExInfo,
|
||||
NULL, NULL))
|
||||
write_stderr("wrote crash dump to %s\n", dumpPath);
|
||||
write_stderr("wrote crash dump to file \"%s\"\n", dumpPath);
|
||||
else
|
||||
write_stderr("could not write crash dump to %s: error code %08x\n",
|
||||
write_stderr("could not write crash dump to file \"%s\": error code %08x\n",
|
||||
dumpPath, (unsigned int) GetLastError());
|
||||
|
||||
CloseHandle(dumpFile);
|
||||
|
@ -882,7 +882,7 @@ OldSerXidAdd(TransactionId xid, SerCommitSeqNo minConflictCommitSeqNo)
|
||||
oldSerXidControl->warningIssued = true;
|
||||
ereport(WARNING,
|
||||
(errmsg("memory for serializable conflict tracking is nearly exhausted"),
|
||||
errhint("There may be an idle transaction or a forgotten prepared transaction causing this.")));
|
||||
errhint("There might be an idle transaction or a forgotten prepared transaction causing this.")));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3937,7 +3937,7 @@ text_format_string_conversion(StringInfo buf, char conversion,
|
||||
else if (conversion == 'I')
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
|
||||
errmsg("NULL cannot be escaped as an SQL identifier")));
|
||||
errmsg("null values cannot be formatted as an SQL identifier")));
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -877,7 +877,7 @@ static struct config_bool ConfigureNamesBool[] =
|
||||
},
|
||||
{
|
||||
{"restart_after_crash", PGC_SIGHUP, ERROR_HANDLING_OPTIONS,
|
||||
gettext_noop("Reinitialize after backend crash."),
|
||||
gettext_noop("Reinitialize server after backend crash."),
|
||||
NULL
|
||||
},
|
||||
&restart_after_crash,
|
||||
@ -1368,7 +1368,7 @@ static struct config_bool ConfigureNamesBool[] =
|
||||
|
||||
{
|
||||
{"hot_standby_feedback", PGC_SIGHUP, WAL_STANDBY_SERVERS,
|
||||
gettext_noop("Allows feedback from a hot standby primary that will avoid query conflicts."),
|
||||
gettext_noop("Allows feedback from a hot standby to the primary that will avoid query conflicts."),
|
||||
NULL
|
||||
},
|
||||
&hot_standby_feedback,
|
||||
@ -1557,7 +1557,7 @@ static struct config_int ConfigureNamesInt[] =
|
||||
|
||||
{
|
||||
{"wal_receiver_status_interval", PGC_SIGHUP, WAL_STANDBY_SERVERS,
|
||||
gettext_noop("Sets the maximum interval between WAL receiver status reports to the master."),
|
||||
gettext_noop("Sets the maximum interval between WAL receiver status reports to the primary."),
|
||||
NULL,
|
||||
GUC_UNIT_S
|
||||
},
|
||||
@ -2955,7 +2955,7 @@ static struct config_string ConfigureNamesString[] =
|
||||
|
||||
{
|
||||
{"synchronous_standby_names", PGC_SIGHUP, WAL_REPLICATION,
|
||||
gettext_noop("List of potential standby names to synchronize with."),
|
||||
gettext_noop("List of names of potential synchronous standbys."),
|
||||
NULL,
|
||||
GUC_LIST_INPUT
|
||||
},
|
||||
|
@ -694,8 +694,8 @@ ALTER FOREIGN TABLE ft1 ALTER COLUMN c5 DROP DEFAULT; -- ERROR
|
||||
ERROR: "ft1" is not a table or view
|
||||
ALTER FOREIGN TABLE ft1 ALTER COLUMN c6 SET NOT NULL;
|
||||
ALTER FOREIGN TABLE ft1 ALTER COLUMN c7 DROP NOT NULL;
|
||||
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10) using '0'; -- ERROR
|
||||
ERROR: ALTER TYPE USING is only supported on plain tables
|
||||
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10) USING '0'; -- ERROR
|
||||
ERROR: "ft1" is not a table
|
||||
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10);
|
||||
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 SET DATA TYPE text;
|
||||
-- can't change the column type if it's used elsewhere
|
||||
|
@ -203,7 +203,7 @@ select format('INSERT INTO %I VALUES(%L,%L)', 'mytab', NULL, 'Hello');
|
||||
|
||||
-- should fail, sql identifier cannot be NULL
|
||||
select format('INSERT INTO %I VALUES(%L,%L)', NULL, 10, 'Hello');
|
||||
ERROR: NULL cannot be escaped as an SQL identifier
|
||||
ERROR: null values cannot be formatted as an SQL identifier
|
||||
-- check positional placeholders
|
||||
select format('%1$s %3$s', 1, 2, 3);
|
||||
format
|
||||
|
@ -294,7 +294,7 @@ ALTER FOREIGN TABLE ft1 ALTER COLUMN c4 SET DEFAULT 0; -- ERROR
|
||||
ALTER FOREIGN TABLE ft1 ALTER COLUMN c5 DROP DEFAULT; -- ERROR
|
||||
ALTER FOREIGN TABLE ft1 ALTER COLUMN c6 SET NOT NULL;
|
||||
ALTER FOREIGN TABLE ft1 ALTER COLUMN c7 DROP NOT NULL;
|
||||
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10) using '0'; -- ERROR
|
||||
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10) USING '0'; -- ERROR
|
||||
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10);
|
||||
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 SET DATA TYPE text;
|
||||
-- can't change the column type if it's used elsewhere
|
||||
|
Loading…
Reference in New Issue
Block a user