Commit60a1d96

committed

Rework DefineIndex relkind check

Simplify coding using a switch rather than nested if tests.Author: ÁlvaroReviewed-by: Robert Haas, Amit Langote, Michaël PaquierDiscussion:https://postgr.es/m/20171013163820.pai7djcaxrntaxtn@alvherre.pgsql

1 parent5fc438f commit60a1d96Copy full SHA for 60a1d96

File tree

-10

lines changed

-10

lines changed

Lines changed: 9 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -375,25 +375,24 @@ DefineIndex(Oid relationId,`
`375`	`375`	`relationId=RelationGetRelid(rel);`
`376`	`376`	`namespaceId=RelationGetNamespace(rel);`
`377`	`377`
`378`		`-if (rel->rd_rel->relkind!=RELKIND_RELATION&&`
`379`		`-rel->rd_rel->relkind!=RELKIND_MATVIEW)`
	`378`	`+/* Ensure that it makes sense to index this kind of relation */`
	`379`	`+switch (rel->rd_rel->relkind)`
`380`	`380`	`{`
`381`		`-if (rel->rd_rel->relkind==RELKIND_FOREIGN_TABLE)`
`382`		`-`
`383`		`-/*`
`384`		`- * Custom error message for FOREIGN TABLE since the term is close`
`385`		`- * to a regular table and can confuse the user.`
`386`		`- */`
	`381`	`+caseRELKIND_RELATION:`
	`382`	`+caseRELKIND_MATVIEW:`
	`383`	`+/* OK */`
	`384`	`+break;`
	`385`	`+caseRELKIND_FOREIGN_TABLE:`
`387`	`386`	`ereport(ERROR,`
`388`	`387`	`(errcode(ERRCODE_WRONG_OBJECT_TYPE),`
`389`	`388`	`errmsg("cannot create index on foreign table \"%s\"",`
`390`	`389`	`RelationGetRelationName(rel))));`
`391`		`-elseif (rel->rd_rel->relkind==RELKIND_PARTITIONED_TABLE)`
	`390`	`+caseRELKIND_PARTITIONED_TABLE:`
`392`	`391`	`ereport(ERROR,`
`393`	`392`	`(errcode(ERRCODE_WRONG_OBJECT_TYPE),`
`394`	`393`	`errmsg("cannot create index on partitioned table \"%s\"",`
`395`	`394`	`RelationGetRelationName(rel))));`
`396`		`-else`
	`395`	`+default:`
`397`	`396`	`ereport(ERROR,`
`398`	`397`	`(errcode(ERRCODE_WRONG_OBJECT_TYPE),`
`399`	`398`	`errmsg("\"%s\" is not a table or materialized view",`

Comments

(0)