From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Mon, 6 Apr 2015 14:15:13 +0000 (-0300)
Subject: Fix object identities for pg_conversion objects
X-Git-Tag: REL9_5_ALPHA1~482
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70dc2db7f1dfdecdacf595bf00964cb20ad5a835;p=thirdparty%2Fpostgresql.git

Fix object identities for pg_conversion objects

This was already fixed in 0d906798f, but I failed to update the
array-formatted case.  This is not backpatched, since this only affects
the code path introduced by commit a676201490c.
---

diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index e82a448e6ff..cf79ea5cc93 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -3756,8 +3756,8 @@ getObjectIdentityParts(const ObjectAddress *object,
 								quote_qualified_identifier(schema,
 														   NameStr(conForm->conname)));
 				if (objname)
-					*objname = list_make1(pstrdup(NameStr(conForm->conname)));
-				pfree(schema);
+					*objname = list_make2(schema,
+										  pstrdup(NameStr(conForm->conname)));
 				ReleaseSysCache(conTup);
 				break;
 			}