database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-16 06:01:02 +03:00
Code Activity

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

Browse Source 
does not return None, per suggestion from Tom.
This commit is contained in:
Neil Conway
2006-02-28 20:56:14 +00:00
parent 87daae1143
commit 2b8afe6193
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pl/plpython/expected/plpython_test.out
View File

@ -190,8 +190,8 @@ SELECT test_void_func1(), test_void_func1() IS NULL AS "is null";
(1 row) (1 row)
SELECT test_void_func2(); -- should fail SELECT test_void_func2(); -- should fail
ERROR: unexpected return value from plpython procedure ERROR: invalid return value from plpython function
DETAIL: void-returning functions must return "None" DETAIL: Functions returning type "void" must return "None".
SELECT test_return_none(), test_return_none() IS NULL AS "is null"; SELECT test_return_none(), test_return_none() IS NULL AS "is null";
test_return_none | is null test_return_none | is null
------------------+--------- ------------------+---------

6
src/pl/plpython/plpython.c
View File

@ -29,7 +29,7 @@
* MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
* *
* IDENTIFICATION * 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) if (plrv != Py_None)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATATYPE_MISMATCH), (errcode(ERRCODE_DATATYPE_MISMATCH),
errmsg("unexpected return value from plpython procedure"), errmsg("invalid return value from plpython function"),
errdetail("void-returning functions must return \"None\""))); errdetail("Functions returning type \"void\" must return \"None\".")));
fcinfo->isnull = false; fcinfo->isnull = false;
rv = (Datum) 0; rv = (Datum) 0;