mirror of https://github.com/postgres/postgres
Mimic the Python interpreter's own logic for printing exceptions instead
of just using the straight str() call, so that
you get
plpy.SPIError
instead of
<class 'plpy.SPIError'>
and for built-in exceptions merely
UnicodeEncodeError
Besides looking better this cuts down on the endless version differences
in the regression test expected files.
REL9_0_ALPHA4_BRANCH
Peter Eisentraut
16 years ago
parent
2edc31c439
commit
44e03742d8
@ -1,12 +1,8 @@ |
||||
Guide to alternative expected files: |
||||
|
||||
plpython_error_2.out Python 2.2, 2.3, 2.4 |
||||
plpython_error.out Python 2.5, 2.6 |
||||
|
||||
plpython_unicode.out any version, when server encoding != SQL_ASCII and client encoding = UTF8; else ... |
||||
plpython_unicode_0.out any version, when server encoding != SQL_ASCII and client encoding != UTF8; else ... |
||||
plpython_unicode_2.out Python 2.2 |
||||
plpython_unicode_3.out Python 2.3, 2.4 |
||||
plpython_unicode_5.out Python 2.5, 2.6 |
||||
plpython_unicode_3.out Python 2.3, 2.4, 2.5, 2.6 |
||||
|
||||
plpython_types_3.out Python 3.1 |
||||
|
||||
@ -1,124 +0,0 @@ |
||||
-- test error handling, i forgot to restore Warn_restart in |
||||
-- the trigger handler once. the errors and subsequent core dump were |
||||
-- interesting. |
||||
/* Flat out syntax error |
||||
*/ |
||||
CREATE FUNCTION sql_syntax_error() RETURNS text |
||||
AS |
||||
'plpy.execute("syntax error")' |
||||
LANGUAGE plpythonu; |
||||
SELECT sql_syntax_error(); |
||||
WARNING: PL/Python: plpy.SPIError: unrecognized error in PLy_spi_execute_query |
||||
CONTEXT: PL/Python function "sql_syntax_error" |
||||
ERROR: syntax error at or near "syntax" |
||||
LINE 1: syntax error |
||||
^ |
||||
QUERY: syntax error |
||||
CONTEXT: PL/Python function "sql_syntax_error" |
||||
/* check the handling of uncaught python exceptions |
||||
*/ |
||||
CREATE FUNCTION exception_index_invalid(text) RETURNS text |
||||
AS |
||||
'return args[1]' |
||||
LANGUAGE plpythonu; |
||||
SELECT exception_index_invalid('test'); |
||||
ERROR: PL/Python: PL/Python function "exception_index_invalid" failed |
||||
DETAIL: exceptions.IndexError: list index out of range |
||||
CONTEXT: PL/Python function "exception_index_invalid" |
||||
/* check handling of nested exceptions |
||||
*/ |
||||
CREATE FUNCTION exception_index_invalid_nested() RETURNS text |
||||
AS |
||||
'rv = plpy.execute("SELECT test5(''foo'')") |
||||
return rv[0]' |
||||
LANGUAGE plpythonu; |
||||
SELECT exception_index_invalid_nested(); |
||||
WARNING: PL/Python: plpy.SPIError: unrecognized error in PLy_spi_execute_query |
||||
CONTEXT: PL/Python function "exception_index_invalid_nested" |
||||
ERROR: function test5(unknown) does not exist |
||||
LINE 1: SELECT test5('foo') |
||||
^ |
||||
HINT: No function matches the given name and argument types. You might need to add explicit type casts. |
||||
QUERY: SELECT test5('foo') |
||||
CONTEXT: PL/Python function "exception_index_invalid_nested" |
||||
/* a typo |
||||
*/ |
||||
CREATE FUNCTION invalid_type_uncaught(a text) RETURNS text |
||||
AS |
||||
'if "plan" not in SD: |
||||
q = "SELECT fname FROM users WHERE lname = $1" |
||||
SD["plan"] = plpy.prepare(q, [ "test" ]) |
||||
rv = plpy.execute(SD["plan"], [ a ]) |
||||
if len(rv): |
||||
return rv[0]["fname"] |
||||
return None |
||||
' |
||||
LANGUAGE plpythonu; |
||||
SELECT invalid_type_uncaught('rick'); |
||||
WARNING: PL/Python: plpy.SPIError: unrecognized error in PLy_spi_prepare |
||||
CONTEXT: PL/Python function "invalid_type_uncaught" |
||||
ERROR: type "test" does not exist |
||||
CONTEXT: PL/Python function "invalid_type_uncaught" |
||||
/* for what it's worth catch the exception generated by |
||||
* the typo, and return None |
||||
*/ |
||||
CREATE FUNCTION invalid_type_caught(a text) RETURNS text |
||||
AS |
||||
'if "plan" not in SD: |
||||
q = "SELECT fname FROM users WHERE lname = $1" |
||||
try: |
||||
SD["plan"] = plpy.prepare(q, [ "test" ]) |
||||
except plpy.SPIError, ex: |
||||
plpy.notice(str(ex)) |
||||
return None |
||||
rv = plpy.execute(SD["plan"], [ a ]) |
||||
if len(rv): |
||||
return rv[0]["fname"] |
||||
return None |
||||
' |
||||
LANGUAGE plpythonu; |
||||
SELECT invalid_type_caught('rick'); |
||||
WARNING: PL/Python: plpy.SPIError: unrecognized error in PLy_spi_prepare |
||||
CONTEXT: PL/Python function "invalid_type_caught" |
||||
ERROR: type "test" does not exist |
||||
CONTEXT: PL/Python function "invalid_type_caught" |
||||
/* for what it's worth catch the exception generated by |
||||
* the typo, and reraise it as a plain error |
||||
*/ |
||||
CREATE FUNCTION invalid_type_reraised(a text) RETURNS text |
||||
AS |
||||
'if "plan" not in SD: |
||||
q = "SELECT fname FROM users WHERE lname = $1" |
||||
try: |
||||
SD["plan"] = plpy.prepare(q, [ "test" ]) |
||||
except plpy.SPIError, ex: |
||||
plpy.error(str(ex)) |
||||
rv = plpy.execute(SD["plan"], [ a ]) |
||||
if len(rv): |
||||
return rv[0]["fname"] |
||||
return None |
||||
' |
||||
LANGUAGE plpythonu; |
||||
SELECT invalid_type_reraised('rick'); |
||||
WARNING: PL/Python: plpy.SPIError: unrecognized error in PLy_spi_prepare |
||||
CONTEXT: PL/Python function "invalid_type_reraised" |
||||
ERROR: type "test" does not exist |
||||
CONTEXT: PL/Python function "invalid_type_reraised" |
||||
/* no typo no messing about |
||||
*/ |
||||
CREATE FUNCTION valid_type(a text) RETURNS text |
||||
AS |
||||
'if "plan" not in SD: |
||||
SD["plan"] = plpy.prepare("SELECT fname FROM users WHERE lname = $1", [ "text" ]) |
||||
rv = plpy.execute(SD["plan"], [ a ]) |
||||
if len(rv): |
||||
return rv[0]["fname"] |
||||
return None |
||||
' |
||||
LANGUAGE plpythonu; |
||||
SELECT valid_type('rick'); |
||||
valid_type |
||||
------------ |
||||
|
||||
(1 row) |
||||
|
||||
@ -1,52 +0,0 @@ |
||||
-- |
||||
-- Unicode handling |
||||
-- |
||||
CREATE TABLE unicode_test ( |
||||
testvalue text NOT NULL |
||||
); |
||||
CREATE FUNCTION unicode_return() RETURNS text AS E' |
||||
return u"\\x80" |
||||
' LANGUAGE plpythonu; |
||||
CREATE FUNCTION unicode_trigger() RETURNS trigger AS E' |
||||
TD["new"]["testvalue"] = u"\\x80" |
||||
return "MODIFY" |
||||
' LANGUAGE plpythonu; |
||||
CREATE TRIGGER unicode_test_bi BEFORE INSERT ON unicode_test |
||||
FOR EACH ROW EXECUTE PROCEDURE unicode_trigger(); |
||||
CREATE FUNCTION unicode_plan1() RETURNS text AS E' |
||||
plan = plpy.prepare("SELECT $1 AS testvalue", ["text"]) |
||||
rv = plpy.execute(plan, [u"\\x80"], 1) |
||||
return rv[0]["testvalue"] |
||||
' LANGUAGE plpythonu; |
||||
CREATE FUNCTION unicode_plan2() RETURNS text AS E' |
||||
plan = plpy.prepare("SELECT $1 || $2 AS testvalue", ["text", u"text"]) |
||||
rv = plpy.execute(plan, ["foo", "bar"], 1) |
||||
return rv[0]["testvalue"] |
||||
' LANGUAGE plpythonu; |
||||
SELECT unicode_return(); |
||||
ERROR: PL/Python: could not convert Python Unicode object to PostgreSQL server encoding |
||||
DETAIL: <type 'exceptions.UnicodeEncodeError'>: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128) |
||||
CONTEXT: while creating return value |
||||
PL/Python function "unicode_return" |
||||
INSERT INTO unicode_test (testvalue) VALUES ('test'); |
||||
ERROR: PL/Python: could not convert Python Unicode object to PostgreSQL server encoding |
||||
DETAIL: <type 'exceptions.UnicodeEncodeError'>: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128) |
||||
CONTEXT: while modifying trigger row |
||||
PL/Python function "unicode_trigger" |
||||
SELECT * FROM unicode_test; |
||||
testvalue |
||||
----------- |
||||
(0 rows) |
||||
|
||||
SELECT unicode_plan1(); |
||||
WARNING: PL/Python: <class 'plpy.Error'>: unrecognized error in PLy_spi_execute_plan |
||||
CONTEXT: PL/Python function "unicode_plan1" |
||||
ERROR: PL/Python: could not convert Python Unicode object to PostgreSQL server encoding |
||||
DETAIL: <type 'exceptions.UnicodeEncodeError'>: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128) |
||||
CONTEXT: PL/Python function "unicode_plan1" |
||||
SELECT unicode_plan2(); |
||||
unicode_plan2 |
||||
--------------- |
||||
foobar |
||||
(1 row) |
||||
|
||||
Loading…
Reference in new issue