From fe793c4df971398e9d757a3cedd75afa46f5bffd Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Mon, 10 Nov 2008 21:49:16 +0000 Subject: [PATCH] Fix a case of string building. --- src/backend/catalog/dependency.c | 10 +++++++--- src/backend/utils/adt/tsvector_op.c | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c index 7e7435b58d..5403433a7c 100644 --- a/src/backend/catalog/dependency.c +++ b/src/backend/catalog/dependency.c @@ -2094,9 +2094,13 @@ getObjectDescription(const ObjectAddress *object) if (OidIsValid(con->conrelid)) { - appendStringInfo(&buffer, _("constraint %s on "), - NameStr(con->conname)); - getRelationDescription(&buffer, con->conrelid); + StringInfoData rel; + + initStringInfo(&rel); + getRelationDescription(&rel, con->conrelid); + appendStringInfo(&buffer, _("constraint %s on %s"), + NameStr(con->conname), rel.data); + pfree(rel.data); } else { diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c index c65c520bba..3b5d21d077 100644 --- a/src/backend/utils/adt/tsvector_op.c +++ b/src/backend/utils/adt/tsvector_op.c @@ -1348,7 +1348,7 @@ tsvector_update_trigger(PG_FUNCTION_ARGS, bool config_column) if (!is_text_type(SPI_gettypeid(rel->rd_att, numattr))) ereport(ERROR, (errcode(ERRCODE_DATATYPE_MISMATCH), - errmsg("column \"%s\" is not of character type", + errmsg("column \"%s\" is not of a character type", trigger->tgargs[i]))); datum = SPI_getbinval(rettuple, rel->rd_att, numattr, &isnull); -- 2.39.5