Fix a case of string building.

alvherre · alvherre · commit a44564b4f8b5 · 2008-11-10T21:49:16.000Z
diff --git 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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.81 2008/10/04 21:56:52 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.82 2008/11/10 21:49:16 alvherre Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -2094,9 +2094,13 @@ getObjectDescription(const ObjectAddress *object)`
`2094`	`2094`
`2095`	`2095`	`if (OidIsValid(con->conrelid))`
`2096`	`2096`	`{`
`2097`		`- appendStringInfo(&buffer, _("constraint %s on "),`
`2098`		`- NameStr(con->conname));`
`2099`		`- getRelationDescription(&buffer, con->conrelid);`
	`2097`	`+ StringInfoData rel;`
	`2098`	`+`
	`2099`	`+ initStringInfo(&rel);`
	`2100`	`+ getRelationDescription(&rel, con->conrelid);`
	`2101`	`+ appendStringInfo(&buffer, _("constraint %s on %s"),`
	`2102`	`+ NameStr(con->conname), rel.data);`
	`2103`	`+ pfree(rel.data);`
`2100`	`2104`	`}`
`2101`	`2105`	`else`
`2102`	`2106`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.16 2008/05/16 16:31:01 tgl Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.17 2008/11/10 21:49:16 alvherre Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1348,7 +1348,7 @@ tsvector_update_trigger(PG_FUNCTION_ARGS, bool config_column)`
`1348`	`1348`	`if (!is_text_type(SPI_gettypeid(rel->rd_att, numattr)))`
`1349`	`1349`	`ereport(ERROR,`
`1350`	`1350`	`(errcode(ERRCODE_DATATYPE_MISMATCH),`
`1351`		`- errmsg("column \"%s\" is not of character type",`
	`1351`	`+ errmsg("column \"%s\" is not of a character type",`
`1352`	`1352`	`trigger->tgargs[i])));`
`1353`	`1353`
`1354`	`1354`	`datum = SPI_getbinval(rettuple, rel->rd_att, numattr, &isnull);`