Commit e84c0195 authored by Tom Lane's avatar Tom Lane

Fix maintenance hazards caused by ill-considered use of default: cases.

Remove default cases from assorted switches over ObjectClass and some
related enum types, so that we'll get compiler warnings when someone
adds a new enum value without accounting for it in all these places.

In passing, re-order some switch cases as needed to match the declaration
of enum ObjectClass.  OK, that's just neatnik-ism, but I dislike code
that looks like it was assembled with the help of a dartboard.

Discussion: https://postgr.es/m/20170512221010.nglatgt5azzdxjlj@alvherre.pgsql
parent b5b0db19
...@@ -1204,6 +1204,10 @@ doDeletion(const ObjectAddress *object, int flags) ...@@ -1204,6 +1204,10 @@ doDeletion(const ObjectAddress *object, int flags)
RemoveSchemaById(object->objectId); RemoveSchemaById(object->objectId);
break; break;
case OCLASS_STATISTIC_EXT:
RemoveStatisticsById(object->objectId);
break;
case OCLASS_TSPARSER: case OCLASS_TSPARSER:
RemoveTSParserById(object->objectId); RemoveTSParserById(object->objectId);
break; break;
...@@ -1265,13 +1269,20 @@ doDeletion(const ObjectAddress *object, int flags) ...@@ -1265,13 +1269,20 @@ doDeletion(const ObjectAddress *object, int flags)
DropTransformById(object->objectId); DropTransformById(object->objectId);
break; break;
case OCLASS_STATISTIC_EXT: /*
RemoveStatisticsById(object->objectId); * These global object types are not supported here.
*/
case OCLASS_ROLE:
case OCLASS_DATABASE:
case OCLASS_TBLSPACE:
case OCLASS_SUBSCRIPTION:
elog(ERROR, "global objects cannot be deleted by doDeletion");
break; break;
default: /*
elog(ERROR, "unrecognized object class: %u", * There's intentionally no default: case here; we want the
object->classId); * compiler to warn if a new OCLASS hasn't been handled above.
*/
} }
} }
......
This diff is collapsed.
...@@ -543,7 +543,8 @@ ExecAlterObjectSchemaStmt(AlterObjectSchemaStmt *stmt, ...@@ -543,7 +543,8 @@ ExecAlterObjectSchemaStmt(AlterObjectSchemaStmt *stmt,
* so it only needs to cover object types that can be members of an * so it only needs to cover object types that can be members of an
* extension, and it doesn't have to deal with certain special cases * extension, and it doesn't have to deal with certain special cases
* such as not wanting to process array types --- those should never * such as not wanting to process array types --- those should never
* be direct members of an extension anyway. * be direct members of an extension anyway. Nonetheless, we insist
* on listing all OCLASS types in the switch.
* *
* Returns the OID of the object's previous namespace, or InvalidOid if * Returns the OID of the object's previous namespace, or InvalidOid if
* object doesn't have a schema. * object doesn't have a schema.
...@@ -578,12 +579,13 @@ AlterObjectNamespace_oid(Oid classId, Oid objid, Oid nspOid, ...@@ -578,12 +579,13 @@ AlterObjectNamespace_oid(Oid classId, Oid objid, Oid nspOid,
oldNspOid = AlterTypeNamespace_oid(objid, nspOid, objsMoved); oldNspOid = AlterTypeNamespace_oid(objid, nspOid, objsMoved);
break; break;
case OCLASS_PROC:
case OCLASS_COLLATION: case OCLASS_COLLATION:
case OCLASS_CONVERSION: case OCLASS_CONVERSION:
case OCLASS_OPERATOR: case OCLASS_OPERATOR:
case OCLASS_OPCLASS: case OCLASS_OPCLASS:
case OCLASS_OPFAMILY: case OCLASS_OPFAMILY:
case OCLASS_PROC: case OCLASS_STATISTIC_EXT:
case OCLASS_TSPARSER: case OCLASS_TSPARSER:
case OCLASS_TSDICT: case OCLASS_TSDICT:
case OCLASS_TSTEMPLATE: case OCLASS_TSTEMPLATE:
...@@ -600,8 +602,38 @@ AlterObjectNamespace_oid(Oid classId, Oid objid, Oid nspOid, ...@@ -600,8 +602,38 @@ AlterObjectNamespace_oid(Oid classId, Oid objid, Oid nspOid,
} }
break; break;
default: case OCLASS_CAST:
case OCLASS_CONSTRAINT:
case OCLASS_DEFAULT:
case OCLASS_LANGUAGE:
case OCLASS_LARGEOBJECT:
case OCLASS_AM:
case OCLASS_AMOP:
case OCLASS_AMPROC:
case OCLASS_REWRITE:
case OCLASS_TRIGGER:
case OCLASS_SCHEMA:
case OCLASS_ROLE:
case OCLASS_DATABASE:
case OCLASS_TBLSPACE:
case OCLASS_FDW:
case OCLASS_FOREIGN_SERVER:
case OCLASS_USER_MAPPING:
case OCLASS_DEFACL:
case OCLASS_EXTENSION:
case OCLASS_EVENT_TRIGGER:
case OCLASS_POLICY:
case OCLASS_PUBLICATION:
case OCLASS_PUBLICATION_REL:
case OCLASS_SUBSCRIPTION:
case OCLASS_TRANSFORM:
/* ignore object types that don't have schema-qualified names */
break; break;
/*
* There's intentionally no default: case here; we want the
* compiler to warn if a new OCLASS hasn't been handled above.
*/
} }
return oldNspOid; return oldNspOid;
......
...@@ -1122,8 +1122,15 @@ EventTriggerSupportsObjectType(ObjectType obtype) ...@@ -1122,8 +1122,15 @@ EventTriggerSupportsObjectType(ObjectType obtype)
case OBJECT_USER_MAPPING: case OBJECT_USER_MAPPING:
case OBJECT_VIEW: case OBJECT_VIEW:
return true; return true;
/*
* There's intentionally no default: case here; we want the
* compiler to warn if a new ObjectType hasn't been handled above.
*/
} }
return true;
/* Shouldn't get here, but if we do, say "no support" */
return false;
} }
/* /*
...@@ -1155,12 +1162,13 @@ EventTriggerSupportsObjectClass(ObjectClass objclass) ...@@ -1155,12 +1162,13 @@ EventTriggerSupportsObjectClass(ObjectClass objclass)
case OCLASS_OPERATOR: case OCLASS_OPERATOR:
case OCLASS_OPCLASS: case OCLASS_OPCLASS:
case OCLASS_OPFAMILY: case OCLASS_OPFAMILY:
case OCLASS_AM:
case OCLASS_AMOP: case OCLASS_AMOP:
case OCLASS_AMPROC: case OCLASS_AMPROC:
case OCLASS_REWRITE: case OCLASS_REWRITE:
case OCLASS_TRIGGER: case OCLASS_TRIGGER:
case OCLASS_SCHEMA: case OCLASS_SCHEMA:
case OCLASS_TRANSFORM: case OCLASS_STATISTIC_EXT:
case OCLASS_TSPARSER: case OCLASS_TSPARSER:
case OCLASS_TSDICT: case OCLASS_TSDICT:
case OCLASS_TSTEMPLATE: case OCLASS_TSTEMPLATE:
...@@ -1171,15 +1179,20 @@ EventTriggerSupportsObjectClass(ObjectClass objclass) ...@@ -1171,15 +1179,20 @@ EventTriggerSupportsObjectClass(ObjectClass objclass)
case OCLASS_DEFACL: case OCLASS_DEFACL:
case OCLASS_EXTENSION: case OCLASS_EXTENSION:
case OCLASS_POLICY: case OCLASS_POLICY:
case OCLASS_AM:
case OCLASS_PUBLICATION: case OCLASS_PUBLICATION:
case OCLASS_PUBLICATION_REL: case OCLASS_PUBLICATION_REL:
case OCLASS_SUBSCRIPTION: case OCLASS_SUBSCRIPTION:
case OCLASS_STATISTIC_EXT: case OCLASS_TRANSFORM:
return true; return true;
/*
* There's intentionally no default: case here; we want the
* compiler to warn if a new OCLASS hasn't been handled above.
*/
} }
return true; /* Shouldn't get here, but if we do, say "no support" */
return false;
} }
bool bool
...@@ -1204,10 +1217,15 @@ EventTriggerSupportsGrantObjectType(GrantObjectType objtype) ...@@ -1204,10 +1217,15 @@ EventTriggerSupportsGrantObjectType(GrantObjectType objtype)
case ACL_OBJECT_NAMESPACE: case ACL_OBJECT_NAMESPACE:
case ACL_OBJECT_TYPE: case ACL_OBJECT_TYPE:
return true; return true;
default:
Assert(false); /*
return true; * There's intentionally no default: case here; we want the
* compiler to warn if a new ACL class hasn't been handled above.
*/
} }
/* Shouldn't get here, but if we do, say "no support" */
return false;
} }
/* /*
...@@ -2229,35 +2247,50 @@ stringify_grantobjtype(GrantObjectType objtype) ...@@ -2229,35 +2247,50 @@ stringify_grantobjtype(GrantObjectType objtype)
return "TABLESPACE"; return "TABLESPACE";
case ACL_OBJECT_TYPE: case ACL_OBJECT_TYPE:
return "TYPE"; return "TYPE";
default:
elog(ERROR, "unrecognized type %d", objtype);
return "???"; /* keep compiler quiet */
} }
elog(ERROR, "unrecognized grant object type: %d", (int) objtype);
return "???"; /* keep compiler quiet */
} }
/* /*
* Return the GrantObjectType as a string; as above, but use the spelling * Return the GrantObjectType as a string; as above, but use the spelling
* in ALTER DEFAULT PRIVILEGES commands instead. * in ALTER DEFAULT PRIVILEGES commands instead. Generally this is just
* the plural.
*/ */
static const char * static const char *
stringify_adefprivs_objtype(GrantObjectType objtype) stringify_adefprivs_objtype(GrantObjectType objtype)
{ {
switch (objtype) switch (objtype)
{ {
case ACL_OBJECT_COLUMN:
return "COLUMNS";
case ACL_OBJECT_RELATION: case ACL_OBJECT_RELATION:
return "TABLES"; return "TABLES";
break;
case ACL_OBJECT_FUNCTION:
return "FUNCTIONS";
break;
case ACL_OBJECT_SEQUENCE: case ACL_OBJECT_SEQUENCE:
return "SEQUENCES"; return "SEQUENCES";
break; case ACL_OBJECT_DATABASE:
return "DATABASES";
case ACL_OBJECT_DOMAIN:
return "DOMAINS";
case ACL_OBJECT_FDW:
return "FOREIGN DATA WRAPPERS";
case ACL_OBJECT_FOREIGN_SERVER:
return "FOREIGN SERVERS";
case ACL_OBJECT_FUNCTION:
return "FUNCTIONS";
case ACL_OBJECT_LANGUAGE:
return "LANGUAGES";
case ACL_OBJECT_LARGEOBJECT:
return "LARGE OBJECTS";
case ACL_OBJECT_NAMESPACE:
return "SCHEMAS";
case ACL_OBJECT_TABLESPACE:
return "TABLESPACES";
case ACL_OBJECT_TYPE: case ACL_OBJECT_TYPE:
return "TYPES"; return "TYPES";
break;
default:
elog(ERROR, "unrecognized type %d", objtype);
return "???"; /* keep compiler quiet */
} }
elog(ERROR, "unrecognized grant object type: %d", (int) objtype);
return "???"; /* keep compiler quiet */
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment