From 6338b50b933520551d2d6b6a2e5b7de8e53fe9e2 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Thu, 15 Jun 2017 10:42:10 +0300 Subject: Fix dependency, when changing a function's argument/return type. When a new base type is created using the old-style procedure of first creating the input/output functions with "opaque" in place of the base type, the "opaque" argument/return type is changed to the final base type, on CREATE TYPE. However, we did not create a pg_depend record when doing that, so the functions were left not depending on the type. Fixes bug #14706, reported by Karen Huddleston. Discussion: https://www.postgresql.org/message-id/20170614232259.1424.82774@wrigleys.postgresql.org --- src/backend/commands/functioncmds.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'src/backend/commands/functioncmds.c') diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c index 2f5a6ea5c54..28c86628536 100644 --- a/src/backend/commands/functioncmds.c +++ b/src/backend/commands/functioncmds.c @@ -1220,6 +1220,8 @@ SetFunctionReturnType(Oid funcOid, Oid newRetType) Relation pg_proc_rel; HeapTuple tup; Form_pg_proc procForm; + ObjectAddress func_address; + ObjectAddress type_address; pg_proc_rel = heap_open(ProcedureRelationId, RowExclusiveLock); @@ -1240,6 +1242,20 @@ SetFunctionReturnType(Oid funcOid, Oid newRetType) CatalogUpdateIndexes(pg_proc_rel, tup); heap_close(pg_proc_rel, RowExclusiveLock); + + /* + * Also update the dependency to the new type. Opaque is a pinned type, so + * there is no old dependency record for it that we would need to remove. + */ + type_address.classId = TypeRelationId; + type_address.objectId = newRetType; + type_address.objectSubId = 0; + + func_address.classId = ProcedureRelationId; + func_address.objectId = funcOid; + func_address.objectSubId = 0; + + recordDependencyOn(&func_address, &type_address, DEPENDENCY_NORMAL); } @@ -1254,6 +1270,8 @@ SetFunctionArgType(Oid funcOid, int argIndex, Oid newArgType) Relation pg_proc_rel; HeapTuple tup; Form_pg_proc procForm; + ObjectAddress func_address; + ObjectAddress type_address; pg_proc_rel = heap_open(ProcedureRelationId, RowExclusiveLock); @@ -1275,6 +1293,20 @@ SetFunctionArgType(Oid funcOid, int argIndex, Oid newArgType) CatalogUpdateIndexes(pg_proc_rel, tup); heap_close(pg_proc_rel, RowExclusiveLock); + + /* + * Also update the dependency to the new type. Opaque is a pinned type, so + * there is no old dependency record for it that we would need to remove. + */ + type_address.classId = TypeRelationId; + type_address.objectId = newArgType; + type_address.objectSubId = 0; + + func_address.classId = ProcedureRelationId; + func_address.objectId = funcOid; + func_address.objectSubId = 0; + + recordDependencyOn(&func_address, &type_address, DEPENDENCY_NORMAL); } -- cgit v1.2.3