for resultTupleDesc use base type (can be domain)

okbob · okbob · commit caeea7418197 · 2026-02-11T20:37:44.000+01:00
diff --git a/src/check_function.c b/src/check_function.c
@@ -992,11 +992,13 @@ plpgsql_check_setup_fcinfo(plpgsql_check_info *cinfo,
 	}
 	else if (!IsPolymorphicType(cinfo->rettype))
 	{
-		if (get_typtype(cinfo->rettype) == TYPTYPE_COMPOSITE)
-			resultTupleDesc = lookup_rowtype_tupdesc_copy(cinfo->rettype, -1);
+		Oid		rettype = getBaseType(cinfo->rettype);
+
+		if (get_typtype(rettype) == TYPTYPE_COMPOSITE)
+			resultTupleDesc = lookup_rowtype_tupdesc_copy(rettype, -1);
 		else
 		{
-			*fake_rtd = cinfo->rettype == RECORDOID;
+			*fake_rtd = rettype == RECORDOID;
 
 			resultTupleDesc = CreateTemplateTupleDesc(1);
 

Original file line number	Diff line number	Diff line change
`@@ -992,11 +992,13 @@ plpgsql_check_setup_fcinfo(plpgsql_check_info *cinfo,`
`992`	`992`	`}`
`993`	`993`	`else if (!IsPolymorphicType(cinfo->rettype))`
`994`	`994`	`{`
`995`		`- if (get_typtype(cinfo->rettype) == TYPTYPE_COMPOSITE)`
`996`		`- resultTupleDesc = lookup_rowtype_tupdesc_copy(cinfo->rettype, -1);`
	`995`	`+ Oid rettype = getBaseType(cinfo->rettype);`
	`996`	`+`
	`997`	`+ if (get_typtype(rettype) == TYPTYPE_COMPOSITE)`
	`998`	`+ resultTupleDesc = lookup_rowtype_tupdesc_copy(rettype, -1);`
`997`	`999`	`else`
`998`	`1000`	`{`
`999`		`- *fake_rtd = cinfo->rettype == RECORDOID;`
	`1001`	`+ *fake_rtd = rettype == RECORDOID;`
`1000`	`1002`
`1001`	`1003`	`resultTupleDesc = CreateTemplateTupleDesc(1);`
`1002`	`1004`