From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Wed, 18 Feb 2015 17:28:12 +0000 (-0300)
Subject: Fix object identities for pg_conversion objects
X-Git-Tag: REL9_4_2~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66463a3cf1a567628be29fc9084c4ff51df772cf;p=postgresql

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.
---

diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index c7c8f4b1a3..2d460bebe0 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;
 			}