Commit0d90679

committed

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

1 parent297b2c1 commit0d90679Copy full SHA for 0d90679

File tree

-2

lines changed

src
- backend/catalog
  - objectaddress.c
- test/regress/expected
  - object_address.out

-2

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3415,17 +3415,21 @@ getObjectIdentityParts(const ObjectAddress *object,`
`3415`	`3415`	`{`
`3416`	`3416`	`HeapTupleconTup;`
`3417`	`3417`	`Form_pg_conversionconForm;`
	`3418`	`+char*schema;`
`3418`	`3419`
`3419`	`3420`	`conTup=SearchSysCache1(CONVOID,`
`3420`	`3421`	`ObjectIdGetDatum(object->objectId));`
`3421`	`3422`	`if (!HeapTupleIsValid(conTup))`
`3422`	`3423`	`elog(ERROR,"cache lookup failed for conversion %u",`
`3423`	`3424`	`object->objectId);`
`3424`	`3425`	`conForm= (Form_pg_conversion)GETSTRUCT(conTup);`
	`3426`	`+schema=get_namespace_name(conForm->connamespace);`
`3425`	`3427`	`appendStringInfoString(&buffer,`
`3426`		`-quote_identifier(NameStr(conForm->conname)));`
	`3428`	`+quote_qualified_identifier(schema,`
	`3429`	`+NameStr(conForm->conname)));`
`3427`	`3430`	`if (objname)`
`3428`	`3431`	`*objname=list_make1(pstrdup(NameStr(conForm->conname)));`
	`3432`	`+pfree(schema);`
`3429`	`3433`	`ReleaseSysCache(conTup);`
`3430`	`3434`	`break;`
`3431`	`3435`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ SELECT (pg_identify_object(addr1.classid, addr1.objid, addr1.subobjid)).*,`
`370`	`370`	`cast \| \| \| (bigint AS integer) \| t`
`371`	`371`	`table constraint \| addr_nsp \| \| a_chk on addr_nsp.gentable \| t`
`372`	`372`	`domain constraint \| addr_nsp \| \| domconstr on addr_nsp.gendomain \| t`
`373`		`- conversion \| pg_catalog \| ascii_to_mic \| ascii_to_mic \| t`
	`373`	`+ conversion \| pg_catalog \| ascii_to_mic \|pg_catalog.ascii_to_mic \| t`
`374`	`374`	`language \| \| plpgsql \| plpgsql \| t`
`375`	`375`	`schema \| \| addr_nsp \| addr_nsp \| t`
`376`	`376`	`operator class \| pg_catalog \| int4_ops \| pg_catalog.int4_ops for btree \| t`

Comments

(0)