Commitf7c7f67

committed

PL/pgSQL: Simplify RETURN checking for procedures

Check at compile time that RETURN in a procedure does not specify aparameter, rather than at run time.

1 parent58d9acc commitf7c7f67Copy full SHA for f7c7f67

File tree

+16

-18

lines changed

+16

-18

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,9 @@ BEGIN`
`17`	`17`	`RETURN 5;`
`18`	`18`	`END;`
`19`	`19`	`$$;`
`20`		`-CALL test_proc2();`
`21`		`-ERROR:cannot return a value from a procedure`
`22`		`-CONTEXT: PL/pgSQL function test_proc2() while casting return value to function's return type`
	`20`	`+ERROR: RETURN cannot have a parameter in a procedure`
	`21`	`+LINE 5: RETURN 5;`
	`22`	`+ ^`
`23`	`23`	`CREATE TABLE test1 (a int);`
`24`	`24`	`CREATE PROCEDURE test_proc3(x int)`
`25`	`25`	`LANGUAGE plpgsql`
`@@ -54,7 +54,6 @@ SELECT * FROM test1;`
`54`	`54`	`(2 rows)`
`55`	`55`
`56`	`56`	`DROP PROCEDURE test_proc1;`
`57`		`-DROP PROCEDURE test_proc2;`
`58`	`57`	`DROP PROCEDURE test_proc3;`
`59`	`58`	`DROP PROCEDURE test_proc4;`
`60`	`59`	`DROP TABLE test1;`

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -617,11 +617,6 @@ plpgsql_exec_function(PLpgSQL_function *func, FunctionCallInfo fcinfo,`
`617`	`617`	`}`
`618`	`618`	`elseif (!estate.retisnull)`
`619`	`619`	`{`
`620`		`-if (func->fn_prokind==PROKIND_PROCEDURE)`
`621`		`-ereport(ERROR,`
`622`		`-(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`623`		`-errmsg("cannot return a value from a procedure")));`
`624`		`-`
`625`	`620`	`/*`
`626`	`621`	`* Cast result value to function's declared result type, and copy it`
`627`	`622`	`* out to the upper executor memory context. We must treat tuple`

Lines changed: 13 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -3138,14 +3138,21 @@ make_return_stmt(int location)`
`3138`	`3138`	`parser_errposition(yylloc)));`
`3139`	`3139`	`new->retvarno = plpgsql_curr_compile->out_param_varno;`
`3140`	`3140`	`}`
`3141`		`-else if (plpgsql_curr_compile->fn_rettype == VOIDOID &&`
`3142`		`- plpgsql_curr_compile->fn_prokind != PROKIND_PROCEDURE)`
	`3141`	`+else if (plpgsql_curr_compile->fn_rettype == VOIDOID)`
`3143`	`3142`	`{`
`3144`	`3143`	`if (yylex() != ';')`
`3145`		`-ereport(ERROR,`
`3146`		`-(errcode(ERRCODE_DATATYPE_MISMATCH),`
`3147`		`- errmsg("RETURN cannot have a parameter in function returning void"),`
`3148`		`- parser_errposition(yylloc)));`
	`3144`	`+{`
	`3145`	`+if (plpgsql_curr_compile->fn_prokind == PROKIND_PROCEDURE)`
	`3146`	`+ereport(ERROR,`
	`3147`	`+(errcode(ERRCODE_SYNTAX_ERROR),`
	`3148`	`+ errmsg("RETURN cannot have a parameter in a procedure"),`
	`3149`	`+ parser_errposition(yylloc)));`
	`3150`	`+else`
	`3151`	`+ereport(ERROR,`
	`3152`	`+(errcode(ERRCODE_DATATYPE_MISMATCH),`
	`3153`	`+ errmsg("RETURN cannot have a parameter in function returning void"),`
	`3154`	`+ parser_errposition(yylloc)));`
	`3155`	`+}`
`3149`	`3156`	`}`
`3150`	`3157`	`else`
`3151`	`3158`	`{`

Lines changed: 0 additions & 3 deletions

Comments

(0)