mirror of
https://git.postgresql.org/git/postgresql.git
synced 2026-02-09 07:17:31 +08:00
37f11c3081
when a plpython function returns unicode" thread: http://archives.postgresql.org/pgsql-bugs/2005-06/msg00105.php In several places PL/Python was calling PyObject_Str() and then PyString_AsString() without checking if the former had returned NULL to indicate an error. PyString_AsString() doesn't expect a NULL argument, so passing one causes a segmentation fault. This patch adds checks for NULL and raises errors via PLy_elog(), which prints details of the underlying Python exception. The patch also adds regression tests for these checks. All tests pass on my Solaris 9 box running HEAD and Python 2.4.1. In one place the patch doesn't call PLy_elog() because that could cause infinite recursion; see the comment I added. I'm not sure how to test that particular case or whether it's even possible to get an error there: the value that the code should check is the Python exception type, so I wonder if a NULL value "shouldn't happen." This patch converts NULL to "Unknown Exception" but I wonder if an Assert() would be appropriate. The patch is against HEAD but the same changes should be applied to earlier versions because they have the same problem. The patch might not apply cleanly against earlier versions -- will the committer take care of little differences or should I submit different versions of the patch? Michael Fuhr
39 lines
1.8 KiB
Plaintext
39 lines
1.8 KiB
Plaintext
-- test error handling, i forgot to restore Warn_restart in
|
|
-- the trigger handler once. the errors and subsequent core dump were
|
|
-- interesting.
|
|
SELECT invalid_type_uncaught('rick');
|
|
WARNING: plpython: in function invalid_type_uncaught:
|
|
DETAIL: plpy.SPIError: Unknown error in PLy_spi_prepare
|
|
ERROR: type "test" does not exist
|
|
SELECT invalid_type_caught('rick');
|
|
WARNING: plpython: in function invalid_type_caught:
|
|
DETAIL: plpy.SPIError: Unknown error in PLy_spi_prepare
|
|
ERROR: type "test" does not exist
|
|
SELECT invalid_type_reraised('rick');
|
|
WARNING: plpython: in function invalid_type_reraised:
|
|
DETAIL: plpy.SPIError: Unknown error in PLy_spi_prepare
|
|
ERROR: type "test" does not exist
|
|
SELECT valid_type('rick');
|
|
valid_type
|
|
------------
|
|
|
|
(1 row)
|
|
|
|
--
|
|
-- Test Unicode error handling.
|
|
--
|
|
SELECT unicode_return_error();
|
|
ERROR: plpython: function "unicode_return_error" could not create return value
|
|
DETAIL: exceptions.UnicodeEncodeError: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)
|
|
INSERT INTO unicode_test (testvalue) VALUES ('test');
|
|
ERROR: plpython: function "unicode_trigger_error" could not modify tuple
|
|
DETAIL: exceptions.UnicodeEncodeError: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)
|
|
SELECT unicode_plan_error1();
|
|
WARNING: plpython: in function unicode_plan_error1:
|
|
DETAIL: plpy.Error: Unknown error in PLy_spi_execute_plan
|
|
ERROR: plpython: function "unicode_plan_error1" could not execute plan
|
|
DETAIL: exceptions.UnicodeEncodeError: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)
|
|
SELECT unicode_plan_error2();
|
|
ERROR: plpython: function "unicode_plan_error2" could not execute plan
|
|
DETAIL: exceptions.UnicodeEncodeError: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)
|