database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

Fix wording in amvalidate error messages

Browse Source 
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:
Alvaro Herrera 2017-05-30 15:45:42 -04:00
parent 185364b161
commit e6785a5ca1
7 changed files with 122 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
contrib/isn/expected/isn.out
View File

@ -10,22 +10,22 @@ FROM (SELECT amname, opcname, opc.oid
WHERE opc.oid >= 16384 WHERE opc.oid >= 16384
ORDER BY 1, 2 OFFSET 0) ss ORDER BY 1, 2 OFFSET 0) ss
WHERE NOT amvalidate(oid); WHERE NOT amvalidate(oid);
INFO: btree operator family "isn_ops" is missing cross-type operator(s) INFO: operator family "isn_ops" of access method btree is missing cross-type operator(s)
INFO: btree operator family "isn_ops" is missing cross-type operator(s) INFO: operator family "isn_ops" of access method btree is missing cross-type operator(s)
INFO: btree operator family "isn_ops" is missing cross-type operator(s) INFO: operator family "isn_ops" of access method btree is missing cross-type operator(s)
INFO: btree operator family "isn_ops" is missing cross-type operator(s) INFO: operator family "isn_ops" of access method btree is missing cross-type operator(s)
INFO: btree operator family "isn_ops" is missing cross-type operator(s) INFO: operator family "isn_ops" of access method btree is missing cross-type operator(s)
INFO: btree operator family "isn_ops" is missing cross-type operator(s) INFO: operator family "isn_ops" of access method btree is missing cross-type operator(s)
INFO: btree operator family "isn_ops" is missing cross-type operator(s) INFO: operator family "isn_ops" of access method btree is missing cross-type operator(s)
INFO: btree operator family "isn_ops" is missing cross-type operator(s) INFO: operator family "isn_ops" of access method btree is missing cross-type operator(s)
INFO: hash operator family "isn_ops" is missing cross-type operator(s) INFO: operator family "isn_ops" of access method hash is missing cross-type operator(s)
INFO: hash operator family "isn_ops" is missing cross-type operator(s) INFO: operator family "isn_ops" of access method hash is missing cross-type operator(s)
INFO: hash operator family "isn_ops" is missing cross-type operator(s) INFO: operator family "isn_ops" of access method hash is missing cross-type operator(s)
INFO: hash operator family "isn_ops" is missing cross-type operator(s) INFO: operator family "isn_ops" of access method hash is missing cross-type operator(s)
INFO: hash operator family "isn_ops" is missing cross-type operator(s) INFO: operator family "isn_ops" of access method hash is missing cross-type operator(s)
INFO: hash operator family "isn_ops" is missing cross-type operator(s) INFO: operator family "isn_ops" of access method hash is missing cross-type operator(s)
INFO: hash operator family "isn_ops" is missing cross-type operator(s) INFO: operator family "isn_ops" of access method hash is missing cross-type operator(s)
INFO: hash operator family "isn_ops" is missing cross-type operator(s) INFO: operator family "isn_ops" of access method hash is missing cross-type operator(s)
amname | opcname amname | opcname
--------+------------ --------+------------
btree | ean13_ops btree | ean13_ops

36
src/backend/access/brin/brin_validate.c
View File

@ -113,8 +113,8 @@ brinvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("brin operator family \"%s\" contains function %s with invalid support number %d", errmsg("operator family \"%s\" of access method %s contains function %s with invalid support number %d",
opfamilyname, opfamilyname, "brin",
format_procedure(procform->amproc), format_procedure(procform->amproc),
procform->amprocnum))); procform->amprocnum)));
result = false; result = false;
@ -129,8 +129,8 @@ brinvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("brin operator family \"%s\" contains function %s with wrong signature for support number %d", errmsg("operator family \"%s\" of access method %s contains function %s with wrong signature for support number %d",
opfamilyname, opfamilyname, "brin",
format_procedure(procform->amproc), format_procedure(procform->amproc),
procform->amprocnum))); procform->amprocnum)));
result = false; result = false;
@ -151,8 +151,8 @@ brinvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("brin operator family \"%s\" contains operator %s with invalid strategy number %d", errmsg("operator family \"%s\" of access method %s contains operator %s with invalid strategy number %d",
opfamilyname, opfamilyname, "brin",
format_operator(oprform->amopopr), format_operator(oprform->amopopr),
oprform->amopstrategy))); oprform->amopstrategy)));
result = false; result = false;
@ -180,8 +180,8 @@ brinvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("brin operator family \"%s\" contains invalid ORDER BY specification for operator %s", errmsg("operator family \"%s\" of access method %s contains invalid ORDER BY specification for operator %s",
opfamilyname, opfamilyname, "brin",
format_operator(oprform->amopopr)))); format_operator(oprform->amopopr))));
result = false; result = false;
} }
@ -193,8 +193,8 @@ brinvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("brin operator family \"%s\" contains operator %s with wrong signature", errmsg("operator family \"%s\" of access method %s contains operator %s with wrong signature",
opfamilyname, opfamilyname, "brin",
format_operator(oprform->amopopr)))); format_operator(oprform->amopopr))));
result = false; result = false;
} }
@ -231,8 +231,8 @@ brinvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("brin operator family \"%s\" is missing operator(s) for types %s and %s", errmsg("operator family \"%s\" of access method %s is missing operator(s) for types %s and %s",
opfamilyname, opfamilyname, "brin",
format_type_be(thisgroup->lefttype), format_type_be(thisgroup->lefttype),
format_type_be(thisgroup->righttype)))); format_type_be(thisgroup->righttype))));
result = false; result = false;
@ -241,8 +241,8 @@ brinvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("brin operator family \"%s\" is missing support function(s) for types %s and %s", errmsg("operator family \"%s\" of access method %s is missing support function(s) for types %s and %s",
opfamilyname, opfamilyname, "brin",
format_type_be(thisgroup->lefttype), format_type_be(thisgroup->lefttype),
format_type_be(thisgroup->righttype)))); format_type_be(thisgroup->righttype))));
result = false; result = false;
@ -254,8 +254,8 @@ brinvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("brin operator class \"%s\" is missing operator(s)", errmsg("operator class \"%s\" of access method %s is missing operator(s)",
opclassname))); opclassname, "brin")));
result = false; result = false;
} }
for (i = 1; i <= BRIN_MANDATORY_NPROCS; i++) for (i = 1; i <= BRIN_MANDATORY_NPROCS; i++)
@ -265,8 +265,8 @@ brinvalidate(Oid opclassoid)
continue; /* got it */ continue; /* got it */
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("brin operator class \"%s\" is missing support function %d", errmsg("operator class \"%s\" of access method %s is missing support function %d",
opclassname, i))); opclassname, "brin", i)));
result = false; result = false;
} }

32
src/backend/access/gin/ginvalidate.c
View File

@ -90,8 +90,8 @@ ginvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gin operator family \"%s\" contains support procedure %s with cross-type registration", errmsg("operator family \"%s\" of access method %s contains support procedure %s with different left and right input types",
opfamilyname, opfamilyname, "gin",
format_procedure(procform->amproc)))); format_procedure(procform->amproc))));
result = false; result = false;
} }
@ -146,8 +146,8 @@ ginvalidate(Oid opclassoid)
default: default:
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gin operator family \"%s\" contains function %s with invalid support number %d", errmsg("operator family \"%s\" of access method %s contains function %s with invalid support number %d",
opfamilyname, opfamilyname, "gin",
format_procedure(procform->amproc), format_procedure(procform->amproc),
procform->amprocnum))); procform->amprocnum)));
result = false; result = false;
@ -158,8 +158,8 @@ ginvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gin operator family \"%s\" contains function %s with wrong signature for support number %d", errmsg("operator family \"%s\" of access method %s contains function %s with wrong signature for support number %d",
opfamilyname, opfamilyname, "gin",
format_procedure(procform->amproc), format_procedure(procform->amproc),
procform->amprocnum))); procform->amprocnum)));
result = false; result = false;
@ -177,8 +177,8 @@ ginvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gin operator family \"%s\" contains operator %s with invalid strategy number %d", errmsg("operator family \"%s\" of access method %s contains operator %s with invalid strategy number %d",
opfamilyname, opfamilyname, "gin",
format_operator(oprform->amopopr), format_operator(oprform->amopopr),
oprform->amopstrategy))); oprform->amopstrategy)));
result = false; result = false;
@ -190,8 +190,8 @@ ginvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gin operator family \"%s\" contains invalid ORDER BY specification for operator %s", errmsg("operator family \"%s\" of access method %s contains invalid ORDER BY specification for operator %s",
opfamilyname, opfamilyname, "gin",
format_operator(oprform->amopopr)))); format_operator(oprform->amopopr))));
result = false; result = false;
} }
@ -203,8 +203,8 @@ ginvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gin operator family \"%s\" contains operator %s with wrong signature", errmsg("operator family \"%s\" of access method %s contains operator %s with wrong signature",
opfamilyname, opfamilyname, "gin",
format_operator(oprform->amopopr)))); format_operator(oprform->amopopr))));
result = false; result = false;
} }
@ -244,8 +244,8 @@ ginvalidate(Oid opclassoid)
continue; /* don't need both, see check below loop */ continue; /* don't need both, see check below loop */
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gin operator class \"%s\" is missing support function %d", errmsg("operator class \"%s\" of access method %s is missing support function %d",
opclassname, i))); opclassname, "gin", i)));
result = false; result = false;
} }
if (!opclassgroup || if (!opclassgroup ||
@ -254,8 +254,8 @@ ginvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gin operator class \"%s\" is missing support function %d or %d", errmsg("operator class \"%s\" of access method %s is missing support function %d or %d",
opclassname, opclassname, "gin",
GIN_CONSISTENT_PROC, GIN_TRICONSISTENT_PROC))); GIN_CONSISTENT_PROC, GIN_TRICONSISTENT_PROC)));
result = false; result = false;
} }

32
src/backend/access/gist/gistvalidate.c
View File

@ -90,8 +90,8 @@ gistvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gist operator family \"%s\" contains support procedure %s with cross-type registration", errmsg("operator family \"%s\" of access method %s contains support procedure %s with different left and right input types",
opfamilyname, opfamilyname, "gist",
format_procedure(procform->amproc)))); format_procedure(procform->amproc))));
result = false; result = false;
} }
@ -143,8 +143,8 @@ gistvalidate(Oid opclassoid)
default: default:
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gist operator family \"%s\" contains function %s with invalid support number %d", errmsg("operator family \"%s\" of access method %s contains function %s with invalid support number %d",
opfamilyname, opfamilyname, "gist",
format_procedure(procform->amproc), format_procedure(procform->amproc),
procform->amprocnum))); procform->amprocnum)));
result = false; result = false;
@ -155,8 +155,8 @@ gistvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gist operator family \"%s\" contains function %s with wrong signature for support number %d", errmsg("operator family \"%s\" of access method %s contains function %s with wrong signature for support number %d",
opfamilyname, opfamilyname, "gist",
format_procedure(procform->amproc), format_procedure(procform->amproc),
procform->amprocnum))); procform->amprocnum)));
result = false; result = false;
@ -175,8 +175,8 @@ gistvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gist operator family \"%s\" contains operator %s with invalid strategy number %d", errmsg("operator family \"%s\" of access method %s contains operator %s with invalid strategy number %d",
opfamilyname, opfamilyname, "gist",
format_operator(oprform->amopopr), format_operator(oprform->amopopr),
oprform->amopstrategy))); oprform->amopstrategy)));
result = false; result = false;
@ -193,8 +193,8 @@ gistvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gist operator family \"%s\" contains unsupported ORDER BY specification for operator %s", errmsg("operator family \"%s\" of access method %s contains unsupported ORDER BY specification for operator %s",
opfamilyname, opfamilyname, "gist",
format_operator(oprform->amopopr)))); format_operator(oprform->amopopr))));
result = false; result = false;
} }
@ -204,8 +204,8 @@ gistvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gist operator family \"%s\" contains incorrect ORDER BY opfamily specification for operator %s", errmsg("operator family \"%s\" of access method %s contains incorrect ORDER BY opfamily specification for operator %s",
opfamilyname, opfamilyname, "gist",
format_operator(oprform->amopopr)))); format_operator(oprform->amopopr))));
result = false; result = false;
} }
@ -223,8 +223,8 @@ gistvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gist operator family \"%s\" contains operator %s with wrong signature", errmsg("operator family \"%s\" of access method %s contains operator %s with wrong signature",
opfamilyname, opfamilyname, "gist",
format_operator(oprform->amopopr)))); format_operator(oprform->amopopr))));
result = false; result = false;
} }
@ -262,8 +262,8 @@ gistvalidate(Oid opclassoid)
continue; /* optional methods */ continue; /* optional methods */
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gist operator class \"%s\" is missing support function %d", errmsg("operator class \"%s\" of access method %s is missing support function %d",
opclassname, i))); opclassname, "gist", i)));
result = false; result = false;
} }

40
src/backend/access/hash/hashvalidate.c
View File

@ -96,8 +96,8 @@ hashvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("hash operator family \"%s\" contains support procedure %s with cross-type registration", errmsg("operator family \"%s\" of access method %s contains support procedure %s with different left and right input types",
opfamilyname, opfamilyname, "hash",
format_procedure(procform->amproc)))); format_procedure(procform->amproc))));
result = false; result = false;
} }
@ -111,8 +111,8 @@ hashvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("hash operator family \"%s\" contains function %s with wrong signature for support number %d", errmsg("operator family \"%s\" of access method %s contains function %s with wrong signature for support number %d",
opfamilyname, opfamilyname, "hash",
format_procedure(procform->amproc), format_procedure(procform->amproc),
procform->amprocnum))); procform->amprocnum)));
result = false; result = false;
@ -128,8 +128,8 @@ hashvalidate(Oid opclassoid)
default: default:
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("hash operator family \"%s\" contains function %s with invalid support number %d", errmsg("operator family \"%s\" of access method %s contains function %s with invalid support number %d",
opfamilyname, opfamilyname, "hash",
format_procedure(procform->amproc), format_procedure(procform->amproc),
procform->amprocnum))); procform->amprocnum)));
result = false; result = false;
@ -149,8 +149,8 @@ hashvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("hash operator family \"%s\" contains operator %s with invalid strategy number %d", errmsg("operator family \"%s\" of access method %s contains operator %s with invalid strategy number %d",
opfamilyname, opfamilyname, "hash",
format_operator(oprform->amopopr), format_operator(oprform->amopopr),
oprform->amopstrategy))); oprform->amopstrategy)));
result = false; result = false;
@ -162,8 +162,8 @@ hashvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("hash operator family \"%s\" contains invalid ORDER BY specification for operator %s", errmsg("operator family \"%s\" of access method %s contains invalid ORDER BY specification for operator %s",
opfamilyname, opfamilyname, "hash",
format_operator(oprform->amopopr)))); format_operator(oprform->amopopr))));
result = false; result = false;
} }
@ -175,8 +175,8 @@ hashvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("hash operator family \"%s\" contains operator %s with wrong signature", errmsg("operator family \"%s\" of access method %s contains operator %s with wrong signature",
opfamilyname, opfamilyname, "hash",
format_operator(oprform->amopopr)))); format_operator(oprform->amopopr))));
result = false; result = false;
} }
@ -187,8 +187,8 @@ hashvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("hash operator family \"%s\" lacks support function for operator %s", errmsg("operator family \"%s\" of access method %s lacks support function for operator %s",
opfamilyname, opfamilyname, "hash",
format_operator(oprform->amopopr)))); format_operator(oprform->amopopr))));
result = false; result = false;
} }
@ -215,8 +215,8 @@ hashvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("hash operator family \"%s\" is missing operator(s) for types %s and %s", errmsg("operator family \"%s\" of access method %s is missing operator(s) for types %s and %s",
opfamilyname, opfamilyname, "hash",
format_type_be(thisgroup->lefttype), format_type_be(thisgroup->lefttype),
format_type_be(thisgroup->righttype)))); format_type_be(thisgroup->righttype))));
result = false; result = false;
@ -229,8 +229,8 @@ hashvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("hash operator class \"%s\" is missing operator(s)", errmsg("operator class \"%s\" of access method %s is missing operator(s)",
opclassname))); opclassname, "hash")));
result = false; result = false;
} }
@ -245,8 +245,8 @@ hashvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("hash operator family \"%s\" is missing cross-type operator(s)", errmsg("operator family \"%s\" of access method %s is missing cross-type operator(s)",
opfamilyname))); opfamilyname, "hash")));
result = false; result = false;
} }

36
src/backend/access/nbtree/nbtvalidate.c
View File

@ -98,8 +98,8 @@ btvalidate(Oid opclassoid)
default: default:
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("btree operator family \"%s\" contains function %s with invalid support number %d", errmsg("operator family \"%s\" of access method %s contains function %s with invalid support number %d",
opfamilyname, opfamilyname, "btree",
format_procedure(procform->amproc), format_procedure(procform->amproc),
procform->amprocnum))); procform->amprocnum)));
result = false; result = false;
@ -110,8 +110,8 @@ btvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("btree operator family \"%s\" contains function %s with wrong signature for support number %d", errmsg("operator family \"%s\" of access method %s contains function %s with wrong signature for support number %d",
opfamilyname, opfamilyname, "btree",
format_procedure(procform->amproc), format_procedure(procform->amproc),
procform->amprocnum))); procform->amprocnum)));
result = false; result = false;
@ -130,8 +130,8 @@ btvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("btree operator family \"%s\" contains operator %s with invalid strategy number %d", errmsg("operator family \"%s\" of access method %s contains operator %s with invalid strategy number %d",
opfamilyname, opfamilyname, "btree",
format_operator(oprform->amopopr), format_operator(oprform->amopopr),
oprform->amopstrategy))); oprform->amopstrategy)));
result = false; result = false;
@ -143,8 +143,8 @@ btvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("btree operator family \"%s\" contains invalid ORDER BY specification for operator %s", errmsg("operator family \"%s\" of access method %s contains invalid ORDER BY specification for operator %s",
opfamilyname, opfamilyname, "btree",
format_operator(oprform->amopopr)))); format_operator(oprform->amopopr))));
result = false; result = false;
} }
@ -156,8 +156,8 @@ btvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("btree operator family \"%s\" contains operator %s with wrong signature", errmsg("operator family \"%s\" of access method %s contains operator %s with wrong signature",
opfamilyname, opfamilyname, "btree",
format_operator(oprform->amopopr)))); format_operator(oprform->amopopr))));
result = false; result = false;
} }
@ -198,8 +198,8 @@ btvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("btree operator family \"%s\" is missing operator(s) for types %s and %s", errmsg("operator family \"%s\" of access method %s is missing operator(s) for types %s and %s",
opfamilyname, opfamilyname, "btree",
format_type_be(thisgroup->lefttype), format_type_be(thisgroup->lefttype),
format_type_be(thisgroup->righttype)))); format_type_be(thisgroup->righttype))));
result = false; result = false;
@ -208,8 +208,8 @@ btvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("btree operator family \"%s\" is missing support function for types %s and %s", errmsg("operator family \"%s\" of access method %s is missing support function for types %s and %s",
opfamilyname, opfamilyname, "btree",
format_type_be(thisgroup->lefttype), format_type_be(thisgroup->lefttype),
format_type_be(thisgroup->righttype)))); format_type_be(thisgroup->righttype))));
result = false; result = false;
@ -222,8 +222,8 @@ btvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("btree operator class \"%s\" is missing operator(s)", errmsg("operator class \"%s\" of access method %s is missing operator(s)",
opclassname))); opclassname, "btree")));
result = false; result = false;
} }
@ -239,8 +239,8 @@ btvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("btree operator family \"%s\" is missing cross-type operator(s)", errmsg("operator family \"%s\" of access method %s is missing cross-type operator(s)",
opfamilyname))); opfamilyname, "btree")));
result = false; result = false;
} }

36
src/backend/access/spgist/spgvalidate.c
View File

@ -90,8 +90,8 @@ spgvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("spgist operator family \"%s\" contains support procedure %s with cross-type registration", errmsg("operator family \"%s\" of access method %s contains support procedure %s with different left and right input types",
opfamilyname, opfamilyname, "spgist",
format_procedure(procform->amproc)))); format_procedure(procform->amproc))));
result = false; result = false;
} }
@ -113,8 +113,8 @@ spgvalidate(Oid opclassoid)
default: default:
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("spgist operator family \"%s\" contains function %s with invalid support number %d", errmsg("operator family \"%s\" of access method %s contains function %s with invalid support number %d",
opfamilyname, opfamilyname, "spgist",
format_procedure(procform->amproc), format_procedure(procform->amproc),
procform->amprocnum))); procform->amprocnum)));
result = false; result = false;
@ -125,8 +125,8 @@ spgvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("spgist operator family \"%s\" contains function %s with wrong signature for support number %d", errmsg("operator family \"%s\" of access method %s contains function %s with wrong signature for support number %d",
opfamilyname, opfamilyname, "spgist",
format_procedure(procform->amproc), format_procedure(procform->amproc),
procform->amprocnum))); procform->amprocnum)));
result = false; result = false;
@ -144,8 +144,8 @@ spgvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("spgist operator family \"%s\" contains operator %s with invalid strategy number %d", errmsg("operator family \"%s\" of access method %s contains operator %s with invalid strategy number %d",
opfamilyname, opfamilyname, "spgist",
format_operator(oprform->amopopr), format_operator(oprform->amopopr),
oprform->amopstrategy))); oprform->amopstrategy)));
result = false; result = false;
@ -157,8 +157,8 @@ spgvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("spgist operator family \"%s\" contains invalid ORDER BY specification for operator %s", errmsg("operator family \"%s\" of access method %s contains invalid ORDER BY specification for operator %s",
opfamilyname, opfamilyname, "spgist",
format_operator(oprform->amopopr)))); format_operator(oprform->amopopr))));
result = false; result = false;
} }
@ -170,8 +170,8 @@ spgvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("spgist operator family \"%s\" contains operator %s with wrong signature", errmsg("operator family \"%s\" of access method %s contains operator %s with wrong signature",
opfamilyname, opfamilyname, "spgist",
format_operator(oprform->amopopr)))); format_operator(oprform->amopopr))));
result = false; result = false;
} }
@ -198,8 +198,8 @@ spgvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("spgist operator family \"%s\" is missing operator(s) for types %s and %s", errmsg("operator family \"%s\" of access method %s is missing operator(s) for types %s and %s",
opfamilyname, opfamilyname, "spgist",
format_type_be(thisgroup->lefttype), format_type_be(thisgroup->lefttype),
format_type_be(thisgroup->righttype)))); format_type_be(thisgroup->righttype))));
result = false; result = false;
@ -218,8 +218,8 @@ spgvalidate(Oid opclassoid)
continue; /* got it */ continue; /* got it */
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("spgist operator family \"%s\" is missing support function %d for type %s", errmsg("operator family \"%s\" of access method %s is missing support function %d for type %s",
opfamilyname, i, opfamilyname, "spgist", i,
format_type_be(thisgroup->lefttype)))); format_type_be(thisgroup->lefttype))));
result = false; result = false;
} }
@ -231,8 +231,8 @@ spgvalidate(Oid opclassoid)
{ {
ereport(INFO, ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("spgist operator class \"%s\" is missing operator(s)", errmsg("operator class \"%s\" of access method %s is missing operator(s)",
opclassname))); opclassname, "spgist")));
result = false; result = false;
} }