Commit2b8afe6

Neil Conway

committed

Tweak the error message emitted when a void-returning PL/Python function

does not return None, per suggestion from Tom.

1 parent87daae1 commit2b8afe6Copy full SHA for 2b8afe6

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -190,8 +190,8 @@ SELECT test_void_func1(), test_void_func1() IS NULL AS "is null";`
`190`	`190`	`(1 row)`
`191`	`191`
`192`	`192`	`SELECT test_void_func2(); -- should fail`
`193`		`-ERROR:unexpected return value from plpythonprocedure`
`194`		`-DETAIL:void-returningfunctionsmust return "None"`
	`193`	`+ERROR:invalid return value from plpythonfunction`
	`194`	`+DETAIL:Functionsreturningtype "void"must return "None".`
`195`	`195`	`SELECT test_return_none(), test_return_none() IS NULL AS "is null";`
`196`	`196`	`test_return_none \| is null`
`197`	`197`	`------------------+---------`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`* MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.`
`30`	`30`	`*`
`31`	`31`	`* IDENTIFICATION`
`32`		`- *$PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.72 2006/02/28 20:03:52 neilc Exp $`
	`32`	`+ *$PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.73 2006/02/28 20:56:14 neilc Exp $`
`33`	`33`	`*`
`34`	`34`	`*********************************************************************`
`35`	`35`	`*/`
`@@ -769,8 +769,8 @@ PLy_function_handler(FunctionCallInfo fcinfo, PLyProcedure * proc)`
`769`	`769`	`if (plrv!=Py_None)`
`770`	`770`	`ereport(ERROR,`
`771`	`771`	`(errcode(ERRCODE_DATATYPE_MISMATCH),`
`772`		`-errmsg("unexpected return value from plpythonprocedure"),`
`773`		`-errdetail("void-returningfunctionsmust return \"None\"")));`
	`772`	`+errmsg("invalid return value from plpythonfunction"),`
	`773`	`+errdetail("Functionsreturningtype \"void\"must return \"None\".")));`
`774`	`774`
`775`	`775`	`fcinfo->isnull= false;`
`776`	`776`	`rv= (Datum)0;`

Comments

(0)