code cleaning and fix regress tests

Author: okbob

expected/plpgsql_check_active.out

@@ -9711,4 +9711,21 @@ select * from plpgsql_check_function('test_retcode_bad');
 (2 rows)
 
 drop function test_retcode_bad;
-drop type t_retcode;
+-- test usage domain of composite in output #202
+create domain t_retcode_domain as t_retcode;
+create or replace function test_retcode_bad(INOUT x1 t_retcode_domain, INOUT x2 int)
+as $$
+begin
+  x1.retcode = concat(x1.retcode, 'xxx');
+  x2 := x2 + 10;
+end;
+$$ language plpgsql;
+select * from plpgsql_check_function('test_retcode_bad');
+                         plpgsql_check_function                         
+------------------------------------------------------------------------
+ warning extra:00000:composite OUT variable "x1" is not single argument
+(1 row)
+
+drop function test_retcode_bad;
+drop type t_retcode cascade;
+NOTICE:  drop cascades to type t_retcode_domain

expected/plpgsql_check_active_2.out

@@ -9710,4 +9710,21 @@ select * from plpgsql_check_function('test_retcode_bad');
 (2 rows)
 
 drop function test_retcode_bad;
-drop type t_retcode;
+-- test usage domain of composite in output #202
+create domain t_retcode_domain as t_retcode;
+create or replace function test_retcode_bad(INOUT x1 t_retcode_domain, INOUT x2 int)
+as $$
+begin
+  x1.retcode = concat(x1.retcode, 'xxx');
+  x2 := x2 + 10;
+end;
+$$ language plpgsql;
+select * from plpgsql_check_function('test_retcode_bad');
+                         plpgsql_check_function                         
+------------------------------------------------------------------------
+ warning extra:00000:composite OUT variable "x1" is not single argument
+(1 row)
+
+drop function test_retcode_bad;
+drop type t_retcode cascade;
+NOTICE:  drop cascades to type t_retcode_domain

expected/plpgsql_check_active_3.out

@@ -9711,4 +9711,21 @@ select * from plpgsql_check_function('test_retcode_bad');
 (2 rows)
 
 drop function test_retcode_bad;
-drop type t_retcode;
+-- test usage domain of composite in output #202
+create domain t_retcode_domain as t_retcode;
+create or replace function test_retcode_bad(INOUT x1 t_retcode_domain, INOUT x2 int)
+as $$
+begin
+  x1.retcode = concat(x1.retcode, 'xxx');
+  x2 := x2 + 10;
+end;
+$$ language plpgsql;
+select * from plpgsql_check_function('test_retcode_bad');
+                         plpgsql_check_function                         
+------------------------------------------------------------------------
+ warning extra:00000:composite OUT variable "x1" is not single argument
+(1 row)
+
+drop function test_retcode_bad;
+drop type t_retcode cascade;
+NOTICE:  drop cascades to type t_retcode_domain

expected/plpgsql_check_active_4.out

@@ -9712,4 +9712,21 @@ select * from plpgsql_check_function('test_retcode_bad');
 (2 rows)
 
 drop function test_retcode_bad;
-drop type t_retcode;
+-- test usage domain of composite in output #202
+create domain t_retcode_domain as t_retcode;
+create or replace function test_retcode_bad(INOUT x1 t_retcode_domain, INOUT x2 int)
+as $$
+begin
+  x1.retcode = concat(x1.retcode, 'xxx');
+  x2 := x2 + 10;
+end;
+$$ language plpgsql;
+select * from plpgsql_check_function('test_retcode_bad');
+                         plpgsql_check_function                         
+------------------------------------------------------------------------
+ warning extra:00000:composite OUT variable "x1" is not single argument
+(1 row)
+
+drop function test_retcode_bad;
+drop type t_retcode cascade;
+NOTICE:  drop cascades to type t_retcode_domain

sql/plpgsql_check_active.sql

@@ -5810,5 +5810,20 @@ $$ language plpgsql;
 select * from plpgsql_check_function('test_retcode_bad');
 
 drop function test_retcode_bad;
-drop type t_retcode;
 
+-- test usage domain of composite in output #202
+create domain t_retcode_domain as t_retcode;
+
+create or replace function test_retcode_bad(INOUT x1 t_retcode_domain, INOUT x2 int)
+as $$
+begin
+  x1.retcode = concat(x1.retcode, 'xxx');
+  x2 := x2 + 10;
+end;
+$$ language plpgsql;
+
+select * from plpgsql_check_function('test_retcode_bad');
+
+drop function test_retcode_bad;
+
+drop type t_retcode cascade;

src/check_function.c

@@ -992,19 +992,19 @@ plpgsql_check_setup_fcinfo(plpgsql_check_info *cinfo,
 	}
 	else if (!IsPolymorphicType(cinfo->rettype))
 	{
-		Oid		rettype = getBaseType(cinfo->rettype);
+		Oid		result_rettype = getBaseType(cinfo->rettype);
 
-		if (get_typtype(rettype) == TYPTYPE_COMPOSITE)
-			resultTupleDesc = lookup_rowtype_tupdesc_copy(rettype, -1);
+		if (get_typtype(result_rettype) == TYPTYPE_COMPOSITE)
+			resultTupleDesc = lookup_rowtype_tupdesc_copy(result_rettype, -1);
 		else
 		{
-			*fake_rtd = rettype == RECORDOID;
+			*fake_rtd = result_rettype == RECORDOID;
 
 			resultTupleDesc = CreateTemplateTupleDesc(1);
 
 			TupleDescInitEntry(resultTupleDesc,
 							   (AttrNumber) 1, "__result__",
-							   cinfo->rettype, -1, 0);
+							   result_rettype, -1, 0);
 			resultTupleDesc = BlessTupleDesc(resultTupleDesc);
 		}
 	}