NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit0bf52bd

committed

Fix object identities for text search objects

We were neglecting to schema-qualify them.Backpatch to 9.3, where object identities were introduced as a conceptby commitf8348ea.

1 parent9612b98 commit0bf52bdCopy full SHA for 0bf52bd

File tree

1 file changed

+21

-8

lines changed

src/backend/catalog
- objectaddress.c

1 file changed

+21

-8

lines changed

`‎src/backend/catalog/objectaddress.c`

Lines changed: 21 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -3056,15 +3056,18 @@ getObjectIdentity(const ObjectAddress *object)`
`3056`	`3056`	`{`
`3057`	`3057`	`HeapTupletup;`
`3058`	`3058`	`Form_pg_ts_parserformParser;`
	`3059`	`+char*schema;`
`3059`	`3060`
`3060`	`3061`	`tup=SearchSysCache1(TSPARSEROID,`
`3061`	`3062`	`ObjectIdGetDatum(object->objectId));`
`3062`	`3063`	`if (!HeapTupleIsValid(tup))`
`3063`	`3064`	`elog(ERROR,"cache lookup failed for text search parser %u",`
`3064`	`3065`	`object->objectId);`
`3065`	`3066`	`formParser= (Form_pg_ts_parser)GETSTRUCT(tup);`
`3066`		`-appendStringInfo(&buffer,"%s",`
`3067`		`-quote_identifier(NameStr(formParser->prsname)));`
	`3067`	`+schema=get_namespace_name(formParser->prsnamespace);`
	`3068`	`+appendStringInfoString(&buffer,`
	`3069`	`+quote_qualified_identifier(schema,`
	`3070`	`+NameStr(formParser->prsname)));`
`3068`	`3071`	`ReleaseSysCache(tup);`
`3069`	`3072`	`break;`
`3070`	`3073`	`}`
`@@ -3073,15 +3076,18 @@ getObjectIdentity(const ObjectAddress *object)`
`3073`	`3076`	`{`
`3074`	`3077`	`HeapTupletup;`
`3075`	`3078`	`Form_pg_ts_dictformDict;`
	`3079`	`+char*schema;`
`3076`	`3080`
`3077`	`3081`	`tup=SearchSysCache1(TSDICTOID,`
`3078`	`3082`	`ObjectIdGetDatum(object->objectId));`
`3079`	`3083`	`if (!HeapTupleIsValid(tup))`
`3080`	`3084`	`elog(ERROR,"cache lookup failed for text search dictionary %u",`
`3081`	`3085`	`object->objectId);`
`3082`	`3086`	`formDict= (Form_pg_ts_dict)GETSTRUCT(tup);`
`3083`		`-appendStringInfo(&buffer,"%s",`
`3084`		`-quote_identifier(NameStr(formDict->dictname)));`
	`3087`	`+schema=get_namespace_name(formDict->dictnamespace);`
	`3088`	`+appendStringInfoString(&buffer,`
	`3089`	`+quote_qualified_identifier(schema,`
	`3090`	`+NameStr(formDict->dictname)));`
`3085`	`3091`	`ReleaseSysCache(tup);`
`3086`	`3092`	`break;`
`3087`	`3093`	`}`
`@@ -3090,15 +3096,19 @@ getObjectIdentity(const ObjectAddress *object)`
`3090`	`3096`	`{`
`3091`	`3097`	`HeapTupletup;`
`3092`	`3098`	`Form_pg_ts_templateformTmpl;`
	`3099`	`+char*schema;`
`3093`	`3100`
`3094`	`3101`	`tup=SearchSysCache1(TSTEMPLATEOID,`
`3095`	`3102`	`ObjectIdGetDatum(object->objectId));`
`3096`	`3103`	`if (!HeapTupleIsValid(tup))`
`3097`	`3104`	`elog(ERROR,"cache lookup failed for text search template %u",`
`3098`	`3105`	`object->objectId);`
`3099`	`3106`	`formTmpl= (Form_pg_ts_template)GETSTRUCT(tup);`
`3100`		`-appendStringInfo(&buffer,"%s",`
`3101`		`-quote_identifier(NameStr(formTmpl->tmplname)));`
	`3107`	`+schema=get_namespace_name(formTmpl->tmplnamespace);`
	`3108`	`+appendStringInfoString(&buffer,`
	`3109`	`+quote_qualified_identifier(schema,`
	`3110`	`+NameStr(formTmpl->tmplname)));`
	`3111`	`+pfree(schema);`
`3102`	`3112`	`ReleaseSysCache(tup);`
`3103`	`3113`	`break;`
`3104`	`3114`	`}`
`@@ -3107,15 +3117,18 @@ getObjectIdentity(const ObjectAddress *object)`
`3107`	`3117`	`{`
`3108`	`3118`	`HeapTupletup;`
`3109`	`3119`	`Form_pg_ts_configformCfg;`
	`3120`	`+char*schema;`
`3110`	`3121`
`3111`	`3122`	`tup=SearchSysCache1(TSCONFIGOID,`
`3112`	`3123`	`ObjectIdGetDatum(object->objectId));`
`3113`	`3124`	`if (!HeapTupleIsValid(tup))`
`3114`	`3125`	`elog(ERROR,"cache lookup failed for text search configuration %u",`
`3115`	`3126`	`object->objectId);`
`3116`	`3127`	`formCfg= (Form_pg_ts_config)GETSTRUCT(tup);`
`3117`		`-appendStringInfo(&buffer,"%s",`
`3118`		`-quote_identifier(NameStr(formCfg->cfgname)));`
	`3128`	`+schema=get_namespace_name(formCfg->cfgnamespace);`
	`3129`	`+appendStringInfoString(&buffer,`
	`3130`	`+quote_qualified_identifier(schema,`
	`3131`	`+NameStr(formCfg->cfgname)));`
`3119`	`3132`	`ReleaseSysCache(tup);`
`3120`	`3133`	`break;`
`3121`	`3134`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit0bf52bd

File tree

1 file changed

1 file changed

`‎src/backend/catalog/objectaddress.c`

0 commit comments