summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Herrera <alvherre@alvh.no-ip.org>2015-02-18 14:28:12 -0300
committerAlvaro Herrera <alvherre@alvh.no-ip.org>2015-02-18 14:28:12 -0300
commit66463a3cf1a567628be29fc9084c4ff51df772cf (patch)
treebd01fbad13eeeccb3ff96be7467b39be66d90233
parenta75dfb73e19e2da5ac0bd9a0c616c42a2a2b5ad1 (diff)
Fix object identities for pg_conversion objects
We were neglecting to schema-qualify them. Backpatch to 9.3, where object identities were introduced as a concept by commit f8348ea32ec8.
-rw-r--r--src/backend/catalog/objectaddress.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index c7c8f4b1a36..2d460bebe01 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -2808,6 +2808,7 @@ getObjectIdentity(const ObjectAddress *object)
{
HeapTuple conTup;
Form_pg_conversion conForm;
+ char *schema;
conTup = SearchSysCache1(CONVOID,
ObjectIdGetDatum(object->objectId));
@@ -2815,8 +2816,11 @@ getObjectIdentity(const ObjectAddress *object)
elog(ERROR, "cache lookup failed for conversion %u",
object->objectId);
conForm = (Form_pg_conversion) GETSTRUCT(conTup);
+ schema = get_namespace_name(conForm->connamespace);
appendStringInfoString(&buffer,
- quote_identifier(NameStr(conForm->conname)));
+ quote_qualified_identifier(schema,
+ NameStr(conForm->conname)));
+ pfree(schema);
ReleaseSysCache(conTup);
break;
}