diff options
| author | Neil Conway <neilc@samurai.com> | 2006-02-28 20:56:14 +0000 |
|---|---|---|
| committer | Neil Conway <neilc@samurai.com> | 2006-02-28 20:56:14 +0000 |
| commit | 2b8afe6193c6e64d956c400397c421be4065acaa (patch) | |
| tree | 2aa7c21efd3aae3252ec65679f6deaca1fb6bf38 | |
| parent | 87daae1143520309da299b78a8e7a68f141a268f (diff) | |
| download | postgresql-2b8afe6193c6e64d956c400397c421be4065acaa.tar.gz postgresql-2b8afe6193c6e64d956c400397c421be4065acaa.zip | |
Tweak the error message emitted when a void-returning PL/Python function
does not return None, per suggestion from Tom.
| -rw-r--r-- | src/pl/plpython/expected/plpython_test.out | 4 | ||||
| -rw-r--r-- | src/pl/plpython/plpython.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/pl/plpython/expected/plpython_test.out b/src/pl/plpython/expected/plpython_test.out index 92243738f66..6aa550dad5d 100644 --- a/src/pl/plpython/expected/plpython_test.out +++ b/src/pl/plpython/expected/plpython_test.out @@ -190,8 +190,8 @@ SELECT test_void_func1(), test_void_func1() IS NULL AS "is null"; (1 row) SELECT test_void_func2(); -- should fail -ERROR: unexpected return value from plpython procedure -DETAIL: void-returning functions must return "None" +ERROR: invalid return value from plpython function +DETAIL: Functions returning type "void" must return "None". SELECT test_return_none(), test_return_none() IS NULL AS "is null"; test_return_none | is null ------------------+--------- diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c index 14c805a29ef..cea843f343a 100644 --- a/src/pl/plpython/plpython.c +++ b/src/pl/plpython/plpython.c @@ -29,7 +29,7 @@ * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.72 2006/02/28 20:03:52 neilc Exp $ + * $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.73 2006/02/28 20:56:14 neilc Exp $ * ********************************************************************* */ @@ -769,8 +769,8 @@ PLy_function_handler(FunctionCallInfo fcinfo, PLyProcedure * proc) if (plrv != Py_None) ereport(ERROR, (errcode(ERRCODE_DATATYPE_MISMATCH), - errmsg("unexpected return value from plpython procedure"), - errdetail("void-returning functions must return \"None\""))); + errmsg("invalid return value from plpython function"), + errdetail("Functions returning type \"void\" must return \"None\"."))); fcinfo->isnull = false; rv = (Datum) 0; |