git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/backend/access/brin/brin_validate.c b/src/backend/access/brin/brin_validate.c

index 4cb1bca8e45e4c0e5af79f94dc6365d9e8f1b4bc..2b3a2cb0abc803bdd28e3e2513cc01e116edbec5 100644 (file)

--- a/src/backend/access/brin/brin_validate.c

+++ b/src/backend/access/brin/brin_validate.c

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("brin opfamily %s contains function %s with invalid support number %d",

+ errmsg("brin operator family \"%s\" contains function %s with invalid support number %d",

opfamilyname,

format_procedure(procform->amproc),

procform->amprocnum)));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("brin opfamily %s contains function %s with wrong signature for support number %d",

+ errmsg("brin operator family \"%s\" contains function %s with wrong signature for support number %d",

opfamilyname,

format_procedure(procform->amproc),

procform->amprocnum)));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("brin opfamily %s contains operator %s with invalid strategy number %d",

+ errmsg("brin operator family \"%s\" contains operator %s with invalid strategy number %d",

opfamilyname,

format_operator(oprform->amopopr),

oprform->amopstrategy)));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("brin opfamily %s contains invalid ORDER BY specification for operator %s",

+ errmsg("brin operator family \"%s\" contains invalid ORDER BY specification for operator %s",

opfamilyname,

format_operator(oprform->amopopr))));

result = false;

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("brin opfamily %s contains operator %s with wrong signature",

+ errmsg("brin operator family \"%s\" contains operator %s with wrong signature",

opfamilyname,

format_operator(oprform->amopopr))));

result = false;

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("brin opfamily %s is missing operator(s) for types %s and %s",

+ errmsg("brin operator family \"%s\" is missing operator(s) for types %s and %s",

opfamilyname,

format_type_be(thisgroup->lefttype),

format_type_be(thisgroup->righttype))));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("brin opfamily %s is missing support function(s) for types %s and %s",

+ errmsg("brin operator family \"%s\" is missing support function(s) for types %s and %s",

opfamilyname,

format_type_be(thisgroup->lefttype),

format_type_be(thisgroup->righttype))));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("brin opclass %s is missing operator(s)",

+ errmsg("brin operator class \"%s\" is missing operator(s)",

opclassname)));

result = false;

}

continue; /* got it */

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("brin opclass %s is missing support function %d",

+ errmsg("brin operator class \"%s\" is missing support function %d",

opclassname, i)));

result = false;

}

diff --git a/src/backend/access/gin/ginvalidate.c b/src/backend/access/gin/ginvalidate.c

index 87177fc96bc6e8adbcfe4187624dfb1548580bad..7518ededd95e1a006ad6b6292c6e2167ba0d46a8 100644 (file)

--- a/src/backend/access/gin/ginvalidate.c

+++ b/src/backend/access/gin/ginvalidate.c

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("gin opfamily %s contains support procedure %s with cross-type registration",

+ errmsg("gin operator family \"%s\" contains support procedure %s with cross-type registration",

opfamilyname,

format_procedure(procform->amproc))));

result = false;

default:

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("gin opfamily %s contains function %s with invalid support number %d",

+ errmsg("gin operator family \"%s\" contains function %s with invalid support number %d",

opfamilyname,

format_procedure(procform->amproc),

procform->amprocnum)));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("gin opfamily %s contains function %s with wrong signature for support number %d",

+ errmsg("gin operator family \"%s\" contains function %s with wrong signature for support number %d",

opfamilyname,

format_procedure(procform->amproc),

procform->amprocnum)));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("gin opfamily %s contains operator %s with invalid strategy number %d",

+ errmsg("gin operator family \"%s\" contains operator %s with invalid strategy number %d",

opfamilyname,

format_operator(oprform->amopopr),

oprform->amopstrategy)));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("gin opfamily %s contains invalid ORDER BY specification for operator %s",

+ errmsg("gin operator family \"%s\" contains invalid ORDER BY specification for operator %s",

opfamilyname,

format_operator(oprform->amopopr))));

result = false;

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("gin opfamily %s contains operator %s with wrong signature",

+ errmsg("gin operator family \"%s\" contains operator %s with wrong signature",

opfamilyname,

format_operator(oprform->amopopr))));

result = false;

continue; /* don't need both, see check below loop */

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("gin opclass %s is missing support function %d",

+ errmsg("gin operator class \"%s\" is missing support function %d",

opclassname, i)));

result = false;

}

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("gin opclass %s is missing support function %d or %d",

+ errmsg("gin operator class \"%s\" is missing support function %d or %d",

opclassname,

GIN_CONSISTENT_PROC, GIN_TRICONSISTENT_PROC)));

result = false;

diff --git a/src/backend/access/gist/gistvalidate.c b/src/backend/access/gist/gistvalidate.c

index d3ada703f30d81a4bde1fbb7cf44d7701f6ad19a..190a3d2f0cf56ba46e56177aa7c13aecd589eef0 100644 (file)

--- a/src/backend/access/gist/gistvalidate.c

+++ b/src/backend/access/gist/gistvalidate.c

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("gist opfamily %s contains support procedure %s with cross-type registration",

+ errmsg("gist operator family \"%s\" contains support procedure %s with cross-type registration",

opfamilyname,

format_procedure(procform->amproc))));

result = false;

default:

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("gist opfamily %s contains function %s with invalid support number %d",

+ errmsg("gist operator family \"%s\" contains function %s with invalid support number %d",

opfamilyname,

format_procedure(procform->amproc),

procform->amprocnum)));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("gist opfamily %s contains function %s with wrong signature for support number %d",

+ errmsg("gist operator family \"%s\" contains function %s with wrong signature for support number %d",

opfamilyname,

format_procedure(procform->amproc),

procform->amprocnum)));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("gist opfamily %s contains operator %s with invalid strategy number %d",

+ errmsg("gist operator family \"%s\" contains operator %s with invalid strategy number %d",

opfamilyname,

format_operator(oprform->amopopr),

oprform->amopstrategy)));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("gist opfamily %s contains unsupported ORDER BY specification for operator %s",

+ errmsg("gist operator family \"%s\" contains unsupported ORDER BY specification for operator %s",

opfamilyname,

format_operator(oprform->amopopr))));

result = false;

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("gist opfamily %s contains incorrect ORDER BY opfamily specification for operator %s",

+ errmsg("gist operator family \"%s\" contains incorrect ORDER BY opfamily specification for operator %s",

opfamilyname,

format_operator(oprform->amopopr))));

result = false;

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("gist opfamily %s contains operator %s with wrong signature",

+ errmsg("gist operator family \"%s\" contains operator %s with wrong signature",

opfamilyname,

format_operator(oprform->amopopr))));

result = false;

continue; /* optional methods */

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("gist opclass %s is missing support function %d",

+ errmsg("gist operator class \"%s\" is missing support function %d",

opclassname, i)));

result = false;

}

diff --git a/src/backend/access/hash/hashvalidate.c b/src/backend/access/hash/hashvalidate.c

index f0395c5ce5f20046cfbca3ccb9c19ac5dc79243a..b9b7bb0395a3a5413c051d813886143d0d03b694 100644 (file)

--- a/src/backend/access/hash/hashvalidate.c

+++ b/src/backend/access/hash/hashvalidate.c

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("hash opfamily %s contains support procedure %s with cross-type registration",

+ errmsg("hash operator family \"%s\" contains support procedure %s with cross-type registration",

opfamilyname,

format_procedure(procform->amproc))));

result = false;

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("hash opfamily %s contains function %s with wrong signature for support number %d",

+ errmsg("hash operator family \"%s\" contains function %s with wrong signature for support number %d",

opfamilyname,

format_procedure(procform->amproc),

procform->amprocnum)));

default:

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("hash opfamily %s contains function %s with invalid support number %d",

+ errmsg("hash operator family \"%s\" contains function %s with invalid support number %d",

opfamilyname,

format_procedure(procform->amproc),

procform->amprocnum)));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("hash opfamily %s contains operator %s with invalid strategy number %d",

+ errmsg("hash operator family \"%s\" contains operator %s with invalid strategy number %d",

opfamilyname,

format_operator(oprform->amopopr),

oprform->amopstrategy)));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("hash opfamily %s contains invalid ORDER BY specification for operator %s",

+ errmsg("hash operator family \"%s\" contains invalid ORDER BY specification for operator %s",

opfamilyname,

format_operator(oprform->amopopr))));

result = false;

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("hash opfamily %s contains operator %s with wrong signature",

+ errmsg("hash operator family \"%s\" contains operator %s with wrong signature",

opfamilyname,

format_operator(oprform->amopopr))));

result = false;

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("hash opfamily %s lacks support function for operator %s",

+ errmsg("hash operator family \"%s\" lacks support function for operator %s",

opfamilyname,

format_operator(oprform->amopopr))));

result = false;

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("hash opfamily %s is missing operator(s) for types %s and %s",

+ errmsg("hash operator family \"%s\" is missing operator(s) for types %s and %s",

opfamilyname,

format_type_be(thisgroup->lefttype),

format_type_be(thisgroup->righttype))));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("hash opclass %s is missing operator(s)",

+ errmsg("hash operator class \"%s\" is missing operator(s)",

opclassname)));

result = false;

}

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("hash opfamily %s is missing cross-type operator(s)",

+ errmsg("hash operator family \"%s\" is missing cross-type operator(s)",

opfamilyname)));

result = false;

}

diff --git a/src/backend/access/nbtree/nbtvalidate.c b/src/backend/access/nbtree/nbtvalidate.c

index e05fe4875f85b8ecc03011adc3f6fdc7aa084a67..7d0bdabc1d3a68b8d367c05a9776c66eac3812f3 100644 (file)

--- a/src/backend/access/nbtree/nbtvalidate.c

+++ b/src/backend/access/nbtree/nbtvalidate.c

default:

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("btree opfamily %s contains function %s with invalid support number %d",

+ errmsg("btree operator family \"%s\" contains function %s with invalid support number %d",

opfamilyname,

format_procedure(procform->amproc),

procform->amprocnum)));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("btree opfamily %s contains function %s with wrong signature for support number %d",

+ errmsg("btree operator family \"%s\" contains function %s with wrong signature for support number %d",

opfamilyname,

format_procedure(procform->amproc),

procform->amprocnum)));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("btree opfamily %s contains operator %s with invalid strategy number %d",

+ errmsg("btree operator family \"%s\" contains operator %s with invalid strategy number %d",

opfamilyname,

format_operator(oprform->amopopr),

oprform->amopstrategy)));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("btree opfamily %s contains invalid ORDER BY specification for operator %s",

+ errmsg("btree operator family \"%s\" contains invalid ORDER BY specification for operator %s",

opfamilyname,

format_operator(oprform->amopopr))));

result = false;

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("btree opfamily %s contains operator %s with wrong signature",

+ errmsg("btree operator family \"%s\" contains operator %s with wrong signature",

opfamilyname,

format_operator(oprform->amopopr))));

result = false;

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("btree opfamily %s is missing operator(s) for types %s and %s",

+ errmsg("btree operator family \"%s\" is missing operator(s) for types %s and %s",

opfamilyname,

format_type_be(thisgroup->lefttype),

format_type_be(thisgroup->righttype))));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("btree opfamily %s is missing support function for types %s and %s",

+ errmsg("btree operator family \"%s\" is missing support function for types %s and %s",

opfamilyname,

format_type_be(thisgroup->lefttype),

format_type_be(thisgroup->righttype))));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("btree opclass %s is missing operator(s)",

+ errmsg("btree operator class \"%s\" is missing operator(s)",

opclassname)));

result = false;

}

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("btree opfamily %s is missing cross-type operator(s)",

+ errmsg("btree operator family \"%s\" is missing cross-type operator(s)",

opfamilyname)));

result = false;

}

diff --git a/src/backend/access/spgist/spgvalidate.c b/src/backend/access/spgist/spgvalidate.c

index 29ae3b8be6faa1dd2614d26bfbb4c45de3e8a773..6297111a7ccce03a9ad286f2cb9ea37f81d2e613 100644 (file)

--- a/src/backend/access/spgist/spgvalidate.c

+++ b/src/backend/access/spgist/spgvalidate.c

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("spgist opfamily %s contains support procedure %s with cross-type registration",

+ errmsg("spgist operator family \"%s\" contains support procedure %s with cross-type registration",

opfamilyname,

format_procedure(procform->amproc))));

result = false;

default:

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("spgist opfamily %s contains function %s with invalid support number %d",

+ errmsg("spgist operator family \"%s\" contains function %s with invalid support number %d",

opfamilyname,

format_procedure(procform->amproc),

procform->amprocnum)));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("spgist opfamily %s contains function %s with wrong signature for support number %d",

+ errmsg("spgist operator family \"%s\" contains function %s with wrong signature for support number %d",

opfamilyname,

format_procedure(procform->amproc),

procform->amprocnum)));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("spgist opfamily %s contains operator %s with invalid strategy number %d",

+ errmsg("spgist operator family \"%s\" contains operator %s with invalid strategy number %d",

opfamilyname,

format_operator(oprform->amopopr),

oprform->amopstrategy)));

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("spgist opfamily %s contains invalid ORDER BY specification for operator %s",

+ errmsg("spgist operator family \"%s\" contains invalid ORDER BY specification for operator %s",

opfamilyname,

format_operator(oprform->amopopr))));

result = false;

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("spgist opfamily %s contains operator %s with wrong signature",

+ errmsg("spgist operator family \"%s\" contains operator %s with wrong signature",

opfamilyname,

format_operator(oprform->amopopr))));

result = false;

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("spgist opfamily %s is missing operator(s) for types %s and %s",

+ errmsg("spgist operator family \"%s\" is missing operator(s) for types %s and %s",

opfamilyname,

format_type_be(thisgroup->lefttype),

format_type_be(thisgroup->righttype))));

continue; /* got it */

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("spgist opfamily %s is missing support function %d for type %s",

+ errmsg("spgist operator family \"%s\" is missing support function %d for type %s",

opfamilyname, i,

format_type_be(thisgroup->lefttype))));

result = false;

{

ereport(INFO,

(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),

- errmsg("spgist opclass %s is missing operator(s)",

+ errmsg("spgist operator class \"%s\" is missing operator(s)",

opclassname)));

result = false;

}

diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c

index 06aedd40bf18b897668c896958d459940d820b81..9f55adcaf5ef0e50fe1ea93e4e725c5c7b794215 100644 (file)

--- a/src/backend/access/transam/twophase.c

+++ b/src/backend/access/transam/twophase.c

if (log_checkpoints && serialized_xacts > 0)

ereport(LOG,

- (errmsg("%u two-phase state files were written "

- "for long-running prepared transactions",

- serialized_xacts)));

+ (errmsg_plural("%u two-phase state file was written "

+ "for long-running prepared transactions",

+ "%u two-phase state files were written "

+ "for long-running prepared transactions",

+ serialized_xacts,

+ serialized_xacts)));

}

/*

diff --git a/src/backend/executor/tqueue.c b/src/backend/executor/tqueue.c

index d29fd2afde430c8e51ec058d7a02b55d97972bea..b5ae3d82b60caa5c7de79c93c264f077b8fa6878 100644 (file)

--- a/src/backend/executor/tqueue.c

+++ b/src/backend/executor/tqueue.c

else if (result != SHM_MQ_SUCCESS)

ereport(ERROR,

(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),

- errmsg("unable to send tuples")));

+ errmsg("could not send tuples")));

return true;

}

diff --git a/src/backend/tsearch/spell.c b/src/backend/tsearch/spell.c

index 835851655f5d0db6e03d240b02e85d01c93bf607..c94268a78a99ecdd6d2bbe290e5979bf7811b7db 100644 (file)

--- a/src/backend/tsearch/spell.c

+++ b/src/backend/tsearch/spell.c

if (Conf->flagMode == FM_LONG && maxstep > 0)

ereport(ERROR,

(errcode(ERRCODE_CONFIG_FILE_ERROR),

- errmsg("invalid affix flag \"%s\" with long flag value", sbuf)));

+ errmsg("invalid affix flag \"%s\" with \"long\" flag value", sbuf)));

*sflag = '0円';

}