From 2b8afe6193c6e64d956c400397c421be4065acaa Mon Sep 17 00:00:00 2001 From: Neil Conway Date: Tue, 28 Feb 2006 20:56:14 +0000 Subject: [PATCH] Tweak the error message emitted when a void-returning PL/Python function does not return None, per suggestion from Tom. --- src/pl/plpython/expected/plpython_test.out | 4 ++-- 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 92243738f6..6aa550dad5 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 14c805a29e..cea843f343 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; -- 2.11.0