diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2008-11-10 21:49:16 +0000 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2008-11-10 21:49:16 +0000 |
| commit | a44564b4f8b5aedc6d48cb70b4985bb2cde0a258 (patch) | |
| tree | 687fd0876121da8db33481cd95660829f4126fe2 /src | |
| parent | 5e11e73d37eb7e356899f307c7c2ba7212c5aac0 (diff) | |
| download | postgresql-a44564b4f8b5aedc6d48cb70b4985bb2cde0a258.tar.gz postgresql-a44564b4f8b5aedc6d48cb70b4985bb2cde0a258.zip | |
Fix a case of string building.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/catalog/dependency.c | 12 | ||||
| -rw-r--r-- | src/backend/utils/adt/tsvector_op.c | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c index b830d668426..8cd1abdf1b9 100644 --- a/src/backend/catalog/dependency.c +++ b/src/backend/catalog/dependency.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.81 2008/10/04 21:56:52 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.82 2008/11/10 21:49:16 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -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 4e7d50b526a..bc342839d99 100644 --- a/src/backend/utils/adt/tsvector_op.c +++ b/src/backend/utils/adt/tsvector_op.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.16 2008/05/16 16:31:01 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.17 2008/11/10 21:49:16 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -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); |