mirror of
https://github.com/postgres/postgres.git
synced 2025-06-26 12:21:12 +03:00
Fix wording in amvalidate error messages
Remove some gratuituous message differences by making the AM name previously embedded in each message be a %s instead. While at it, get rid of terminology that's unclear and unnecessary in one message. Discussion: https://postgr.es/m/20170523001557.bq2hbq7hxyvyw62q@alvherre.pgsql
This commit is contained in:
@ -89,8 +89,8 @@ gistvalidate(Oid opclassoid)
|
||||
{
|
||||
ereport(INFO,
|
||||
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
|
||||
errmsg("gist operator family \"%s\" contains support procedure %s with cross-type registration",
|
||||
opfamilyname,
|
||||
errmsg("operator family \"%s\" of access method %s contains support procedure %s with different left and right input types",
|
||||
opfamilyname, "gist",
|
||||
format_procedure(procform->amproc))));
|
||||
result = false;
|
||||
}
|
||||
@ -142,8 +142,8 @@ gistvalidate(Oid opclassoid)
|
||||
default:
|
||||
ereport(INFO,
|
||||
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
|
||||
errmsg("gist operator family \"%s\" contains function %s with invalid support number %d",
|
||||
opfamilyname,
|
||||
errmsg("operator family \"%s\" of access method %s contains function %s with invalid support number %d",
|
||||
opfamilyname, "gist",
|
||||
format_procedure(procform->amproc),
|
||||
procform->amprocnum)));
|
||||
result = false;
|
||||
@ -154,8 +154,8 @@ gistvalidate(Oid opclassoid)
|
||||
{
|
||||
ereport(INFO,
|
||||
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
|
||||
errmsg("gist operator family \"%s\" contains function %s with wrong signature for support number %d",
|
||||
opfamilyname,
|
||||
errmsg("operator family \"%s\" of access method %s contains function %s with wrong signature for support number %d",
|
||||
opfamilyname, "gist",
|
||||
format_procedure(procform->amproc),
|
||||
procform->amprocnum)));
|
||||
result = false;
|
||||
@ -174,8 +174,8 @@ gistvalidate(Oid opclassoid)
|
||||
{
|
||||
ereport(INFO,
|
||||
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
|
||||
errmsg("gist operator family \"%s\" contains operator %s with invalid strategy number %d",
|
||||
opfamilyname,
|
||||
errmsg("operator family \"%s\" of access method %s contains operator %s with invalid strategy number %d",
|
||||
opfamilyname, "gist",
|
||||
format_operator(oprform->amopopr),
|
||||
oprform->amopstrategy)));
|
||||
result = false;
|
||||
@ -192,8 +192,8 @@ gistvalidate(Oid opclassoid)
|
||||
{
|
||||
ereport(INFO,
|
||||
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
|
||||
errmsg("gist operator family \"%s\" contains unsupported ORDER BY specification for operator %s",
|
||||
opfamilyname,
|
||||
errmsg("operator family \"%s\" of access method %s contains unsupported ORDER BY specification for operator %s",
|
||||
opfamilyname, "gist",
|
||||
format_operator(oprform->amopopr))));
|
||||
result = false;
|
||||
}
|
||||
@ -203,8 +203,8 @@ gistvalidate(Oid opclassoid)
|
||||
{
|
||||
ereport(INFO,
|
||||
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
|
||||
errmsg("gist operator family \"%s\" contains incorrect ORDER BY opfamily specification for operator %s",
|
||||
opfamilyname,
|
||||
errmsg("operator family \"%s\" of access method %s contains incorrect ORDER BY opfamily specification for operator %s",
|
||||
opfamilyname, "gist",
|
||||
format_operator(oprform->amopopr))));
|
||||
result = false;
|
||||
}
|
||||
@ -222,8 +222,8 @@ gistvalidate(Oid opclassoid)
|
||||
{
|
||||
ereport(INFO,
|
||||
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
|
||||
errmsg("gist operator family \"%s\" contains operator %s with wrong signature",
|
||||
opfamilyname,
|
||||
errmsg("operator family \"%s\" of access method %s contains operator %s with wrong signature",
|
||||
opfamilyname, "gist",
|
||||
format_operator(oprform->amopopr))));
|
||||
result = false;
|
||||
}
|
||||
@ -261,8 +261,8 @@ gistvalidate(Oid opclassoid)
|
||||
continue; /* optional methods */
|
||||
ereport(INFO,
|
||||
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
|
||||
errmsg("gist operator class \"%s\" is missing support function %d",
|
||||
opclassname, i)));
|
||||
errmsg("operator class \"%s\" of access method %s is missing support function %d",
|
||||
opclassname, "gist", i)));
|
||||
result = false;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user