*** ./src/backend/executor/functions.c.orig 2006-03-16 16:40:15.000000000 +0100 --- ./src/backend/executor/functions.c 2006-03-16 16:46:02.000000000 +0100 *************** *** 897,930 **** tlist = parse->targetList; /* ! * The last query must be a SELECT if and only if return type isn't VOID. */ if (rettype == VOIDOID) { - if (cmd == CMD_SELECT) { tlistlen = ExecCleanTargetListLength(tlist); restype = exprType((Node *) ((TargetEntry *) linitial(tlist))->expr); ! ! if (tlistlen == 1 && restype == rettype) return true; ! ereport(ERROR, (errcode(ERRCODE_INVALID_FUNCTION_DEFINITION), ! errmsg("return type mismatch in function declared to return %s", ! format_type_be(rettype)), ! errdetail("Function's final statement must not be a SELECT."))); return false; } } ! /* by here, the function is declared to return some type */ if (cmd != CMD_SELECT) ereport(ERROR, (errcode(ERRCODE_INVALID_FUNCTION_DEFINITION), ! errmsg("return type mismatch in function declared to return %s", ! format_type_be(rettype)), errdetail("Function's final statement must be a SELECT."))); /* --- 897,931 ---- tlist = parse->targetList; /* ! * The last query must be a SELECT if and only if return type isn't VOID or ! * last query have to return VOID. */ if (rettype == VOIDOID) { if (cmd == CMD_SELECT) { tlistlen = ExecCleanTargetListLength(tlist); restype = exprType((Node *) ((TargetEntry *) linitial(tlist))->expr); ! ! if (tlistlen == 1 && restype == VOIDOID) return true; ! ereport(ERROR, (errcode(ERRCODE_INVALID_FUNCTION_DEFINITION), ! errmsg("return type mismatch in function declared to return %s", ! format_type_be(rettype)), ! errdetail("Function's final statement must not be a SELECT."))); ! return false; } } ! /* by here, the function is declared to return some type */ if (cmd != CMD_SELECT) ereport(ERROR, (errcode(ERRCODE_INVALID_FUNCTION_DEFINITION), ! errmsg("return type mismatch in function declared to return %s", ! format_type_be(rettype)), errdetail("Function's final statement must be a SELECT."))); /* *** ./src/test/regress/expected/plpgsql.out.orig 2006-03-16 18:19:51.000000000 +0100 --- ./src/test/regress/expected/plpgsql.out 2006-03-16 18:26:36.000000000 +0100 *************** *** 2776,2778 **** --- 2776,2808 ---- (1 row) + -- sql functions can be used for wrapping plpgsql void functions + create function void_fce() returns void as $$ + postgres$# begin + raise notice 'kuku'; + postgres$# end; $$ language plpgsql; + CREATE FUNCTION + postgres=# + -- error + create function void_sql_fce() returns void as $$ + select 1; + postgres$# $$ language sql; + ERROR: return type mismatch in function declared to return void + DETAIL: Function's final statement must not be a SELECT. + CONTEXT: SQL function "void_sql_fce" + -- ok + create function void_sql_fce() returns void as $$ + select void_fce(); + $$ language sql; + CREATE FUNCTION + select void_sql_fce(); + NOTICE: kuku + CONTEXT: SQL function "void_sql_fce" statement 1 + void_sql_fce + -------------- + + (1 row) + drop function void_sql_fce(); + DROP FUNCTION + drop function void_fce(); + DROP FUNCTION *** ./src/test/regress/sql/plpgsql.sql.orig 2006-03-16 18:11:41.000000000 +0100 --- ./src/test/regress/sql/plpgsql.sql 2006-03-16 18:26:23.000000000 +0100 *************** *** 2309,2311 **** --- 2309,2334 ---- $proc$ language plpgsql; select for_vect(); + + -- sql functions can be used for wrapping plpgsql void functions + create function void_fce() returns void as $$ + begin + raise notice 'kuku'; + end; $$ language plpgsql; + + -- error + create function void_sql_fce() returns void as $$ + select 1; + $$ language sql; + + -- ok + create function void_sql_fce() returns void as $$ + select void_fce(); + $$ language sql; + + select void_sql_fce(); + + drop function void_sql_fce(); + drop function void_fce(); + +