From a196e67f930e0fef10928928122770d59b14b653 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Wed, 18 Feb 2015 14:28:12 -0300 Subject: [PATCH] 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. --- src/backend/catalog/objectaddress.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index f1fe67b6c50..6c90b7f46c9 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -2785,6 +2785,7 @@ getObjectIdentity(const ObjectAddress *object) { HeapTuple conTup; Form_pg_conversion conForm; + char *schema; conTup = SearchSysCache1(CONVOID, ObjectIdGetDatum(object->objectId)); @@ -2792,8 +2793,11 @@ getObjectIdentity(const ObjectAddress *object) elog(ERROR, "cache lookup failed for conversion %u", object->objectId); conForm = (Form_pg_conversion) GETSTRUCT(conTup); - appendStringInfo(&buffer, "%s", - quote_identifier(NameStr(conForm->conname))); + schema = get_namespace_name(conForm->connamespace); + appendStringInfoString(&buffer, + quote_qualified_identifier(schema, + NameStr(conForm->conname))); + pfree(schema); ReleaseSysCache(conTup); break; }