Commit149b1dd

committed

Fix omission of OCLASS_TRANSFORM in object_classes[]

This was forgotten incac7658 (and its fixupad89a5d). Since itseems way too easy to miss this, this commit also introduces a mechanismto enforce that the array is consistent with the enum.Problem reported independently by Robert Haas and Jaimin Pan.Patches proposed by Jaimin Pan, Jim Nasby, Michael Paquier and myself,though I didn't use any of these and instead went with a cleanerapproach suggested by Tom Lane.Backpatch to 9.5.Discussion:https://www.postgresql.org/message-id/CA+Tgmoa6SgDaxW_n_7SEhwBAc=mniYga+obUj5fmw4rU9_mLvA@mail.gmail.com https://www.postgresql.org/message-id/29788.1437411581@sss.pgh.pa.us

1 parenteb11de8 commit149b1ddCopy full SHA for 149b1dd

File tree

+13

-14

lines changed

+13

-14

lines changed

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ typedef struct`
`126`	`126`	`* This constant table maps ObjectClasses to the corresponding catalog OIDs.`
`127`	`127`	`* See also getObjectClass().`
`128`	`128`	`*/`
`129`		`-staticconstOidobject_classes[MAX_OCLASS]= {`
	`129`	`+staticconstOidobject_classes[]= {`
`130`	`130`	`RelationRelationId,/* OCLASS_CLASS */`
`131`	`131`	`ProcedureRelationId,/* OCLASS_PROC */`
`132`	`132`	`TypeRelationId,/* OCLASS_TYPE */`
`@@ -158,7 +158,8 @@ static const Oid object_classes[MAX_OCLASS] = {`
`158`	`158`	`DefaultAclRelationId,/* OCLASS_DEFACL */`
`159`	`159`	`ExtensionRelationId,/* OCLASS_EXTENSION */`
`160`	`160`	`EventTriggerRelationId,/* OCLASS_EVENT_TRIGGER */`
`161`		`-PolicyRelationId/* OCLASS_POLICY */`
	`161`	`+PolicyRelationId,/* OCLASS_POLICY */`
	`162`	`+TransformRelationId/* OCLASS_TRANSFORM */`
`162`	`163`	`};`
`163`	`164`
`164`	`165`
`@@ -2037,6 +2038,12 @@ add_object_address(ObjectClass oclass, Oid objectId, int32 subId,`
`2037`	`2038`	`{`
`2038`	`2039`	`ObjectAddress*item;`
`2039`	`2040`
	`2041`	`+/*`
	`2042`	`+ * Make sure object_classes is kept up to date with the ObjectClass enum.`
	`2043`	`+ */`
	`2044`	`+StaticAssertStmt(lengthof(object_classes)==LAST_OCLASS+1,`
	`2045`	`+"object_classes[] must cover all ObjectClasses");`
	`2046`	`+`
`2040`	`2047`	`/* enlarge array if needed */`
`2041`	`2048`	`if (addrs->numrefs >=addrs->maxrefs)`
`2042`	`2049`	`{`

Lines changed: 0 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1168,15 +1168,6 @@ EventTriggerSupportsObjectClass(ObjectClass objclass)`
`1168`	`1168`	`caseOCLASS_EXTENSION:`
`1169`	`1169`	`caseOCLASS_POLICY:`
`1170`	`1170`	`return true;`
`1171`		`-`
`1172`		`-caseMAX_OCLASS:`
`1173`		`-`
`1174`		`-/*`
`1175`		`- * This shouldn't ever happen, but we keep the case to avoid a`
`1176`		`- * compiler warning without a "default" clause in the switch.`
`1177`		`- */`
`1178`		`-Assert(false);`
`1179`		`-break;`
`1180`	`1171`	`}`
`1181`	`1172`
`1182`	`1173`	`return true;`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ typedef struct ObjectAddresses ObjectAddresses;`
`112`	`112`
`113`	`113`	`/*`
`114`	`114`	`* This enum covers all system catalogs whose OIDs can appear in`
`115`		`- * pg_depend.classId or pg_shdepend.classId.`
	`115`	`+ * pg_depend.classId or pg_shdepend.classId. Keep object_classes[] in sync.`
`116`	`116`	`*/`
`117`	`117`	`typedefenumObjectClass`
`118`	`118`	`{`
`@@ -148,10 +148,11 @@ typedef enum ObjectClass`
`148`	`148`	`OCLASS_EXTENSION,/* pg_extension */`
`149`	`149`	`OCLASS_EVENT_TRIGGER,/* pg_event_trigger */`
`150`	`150`	`OCLASS_POLICY,/* pg_policy */`
`151`		`-OCLASS_TRANSFORM,/* pg_transform */`
`152`		`-MAX_OCLASS/* MUST BE LAST */`
	`151`	`+OCLASS_TRANSFORM/* pg_transform */`
`153`	`152`	`}ObjectClass;`
`154`	`153`
	`154`	`+#defineLAST_OCLASSOCLASS_TRANSFORM`
	`155`	`+`
`155`	`156`
`156`	`157`	`/* in dependency.c */`
`157`	`158`

Comments

(0)