diff options
| author | Michael Paquier <michael@paquier.xyz> | 2023-07-10 13:08:10 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2023-07-10 13:08:10 +0900 |
| commit | 9b286858e3ab1647304c5fbb2b1529de6bead8f7 (patch) | |
| tree | 49e054aed70a033106195ce595723e842be52a0d /src/backend/commands/cluster.c | |
| parent | bd5ddbe8666a11e34ba77e4c1788c4832dcd9a50 (diff) | |
Add more sanity checks with callers of changeDependencyFor()
changeDependencyFor() returns the number of pg_depend entries changed,
or 0 if there is a problem. The callers of this routine expect only one
dependency to change, but they did not check for the result returned.
The following code paths gain checks:
- Namespace for extensions.
- Namespace for various object types (see AlterObjectNamespace).
- Planner support function for a function.
Some existing error messages related to all that are reworded to be more
consistent with the project style, and the new error messages added
follow the same style. This change has exposed one bug fixed a bit
earlier with bd5ddbe.
Reviewed-by: Heikki Linnakangas, Akshat Jaimini
Discussion: https://postgr.es/m/ZJzD/rn+UbloKjB7@paquier.xyz
Diffstat (limited to 'src/backend/commands/cluster.c')
| -rw-r--r-- | src/backend/commands/cluster.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 92c465c05b4..a3bef6ac34f 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -1271,7 +1271,7 @@ swap_relation_files(Oid r1, Oid r2, bool target_is_pg_class, AccessMethodRelationId, relam1, relam2) != 1) - elog(ERROR, "failed to change access method dependency for relation \"%s.%s\"", + elog(ERROR, "could not change access method dependency for relation \"%s.%s\"", get_namespace_name(get_rel_namespace(r1)), get_rel_name(r1)); if (changeDependencyFor(RelationRelationId, @@ -1279,7 +1279,7 @@ swap_relation_files(Oid r1, Oid r2, bool target_is_pg_class, AccessMethodRelationId, relam2, relam1) != 1) - elog(ERROR, "failed to change access method dependency for relation \"%s.%s\"", + elog(ERROR, "could not change access method dependency for relation \"%s.%s\"", get_namespace_name(get_rel_namespace(r2)), get_rel_name(r2)); } |