Skip to content

Commit 1fb1049

Browse files
peterepetere
committed
plpython_error.out is for Python 2.4, plpython_error_3.out is for Python 2.5,
as it was previously.
1 parent 6587818 commit 1fb1049

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

‎src/pl/plpython/expected/plpython_error.out

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
-- interesting.
44
SELECT invalid_type_uncaught('rick');
55
WARNING: PL/Python: in PL/Python function "invalid_type_uncaught"
6-
DETAIL: <class 'plpy.SPIError'>: unrecognized error in PLy_spi_prepare
6+
DETAIL: plpy.SPIError: unrecognized error in PLy_spi_prepare
77
ERROR: type "test" does not exist
88
SELECT invalid_type_caught('rick');
99
WARNING: PL/Python: in PL/Python function "invalid_type_caught"
10-
DETAIL: <class 'plpy.SPIError'>: unrecognized error in PLy_spi_prepare
10+
DETAIL: plpy.SPIError: unrecognized error in PLy_spi_prepare
1111
ERROR: type "test" does not exist
1212
SELECT invalid_type_reraised('rick');
1313
WARNING: PL/Python: in PL/Python function "invalid_type_reraised"
14-
DETAIL: <class 'plpy.SPIError'>: unrecognized error in PLy_spi_prepare
14+
DETAIL: plpy.SPIError: unrecognized error in PLy_spi_prepare
1515
ERROR: type "test" does not exist
1616
SELECT valid_type('rick');
1717
valid_type
@@ -24,15 +24,15 @@ SELECT valid_type('rick');
2424
--
2525
SELECT unicode_return_error();
2626
ERROR: PL/Python: could not create string representation of Python object in PL/Python function "unicode_return_error" while creating return value
27-
DETAIL: <type 'exceptions.UnicodeEncodeError'>: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)
27+
DETAIL: exceptions.UnicodeEncodeError: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)
2828
INSERT INTO unicode_test (testvalue) VALUES ('test');
2929
ERROR: PL/Python: could not compute string representation of Python object in PL/Python function "unicode_trigger_error" while modifying trigger row
30-
DETAIL: <type 'exceptions.UnicodeEncodeError'>: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)
30+
DETAIL: exceptions.UnicodeEncodeError: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)
3131
SELECT unicode_plan_error1();
3232
WARNING: PL/Python: in PL/Python function "unicode_plan_error1"
33-
DETAIL: <class 'plpy.Error'>: unrecognized error in PLy_spi_execute_plan
33+
DETAIL: plpy.Error: unrecognized error in PLy_spi_execute_plan
3434
ERROR: PL/Python: PL/Python function "unicode_plan_error1" could not execute plan
35-
DETAIL: <type 'exceptions.UnicodeEncodeError'>: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)
35+
DETAIL: exceptions.UnicodeEncodeError: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)
3636
SELECT unicode_plan_error2();
3737
ERROR: PL/Python: PL/Python function "unicode_plan_error2" could not execute plan
38-
DETAIL: <type 'exceptions.UnicodeEncodeError'>: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)
38+
DETAIL: exceptions.UnicodeEncodeError: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)

‎src/pl/plpython/expected/plpython_error_3.out

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
-- the trigger handler once. the errors and subsequent core dump were
33
-- interesting.
44
SELECT invalid_type_uncaught('rick');
5-
WARNING: plpython: in function invalid_type_uncaught:
6-
DETAIL: <class 'plpy.SPIError'>: Unknown error in PLy_spi_prepare
5+
WARNING: PL/Python: in PL/Python function "invalid_type_uncaught"
6+
DETAIL: <class 'plpy.SPIError'>: unrecognized error in PLy_spi_prepare
77
ERROR: type "test" does not exist
88
SELECT invalid_type_caught('rick');
9-
WARNING: plpython: in function invalid_type_caught:
10-
DETAIL: <class 'plpy.SPIError'>: Unknown error in PLy_spi_prepare
9+
WARNING: PL/Python: in PL/Python function "invalid_type_caught"
10+
DETAIL: <class 'plpy.SPIError'>: unrecognized error in PLy_spi_prepare
1111
ERROR: type "test" does not exist
1212
SELECT invalid_type_reraised('rick');
13-
WARNING: plpython: in function invalid_type_reraised:
14-
DETAIL: <class 'plpy.SPIError'>: Unknown error in PLy_spi_prepare
13+
WARNING: PL/Python: in PL/Python function "invalid_type_reraised"
14+
DETAIL: <class 'plpy.SPIError'>: unrecognized error in PLy_spi_prepare
1515
ERROR: type "test" does not exist
1616
SELECT valid_type('rick');
1717
valid_type
@@ -23,16 +23,16 @@ SELECT valid_type('rick');
2323
-- Test Unicode error handling.
2424
--
2525
SELECT unicode_return_error();
26-
ERROR: plpython: function "unicode_return_error" could not create return value
26+
ERROR: PL/Python: could not create string representation of Python object in PL/Python function "unicode_return_error" while creating return value
2727
DETAIL: <type 'exceptions.UnicodeEncodeError'>: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)
2828
INSERT INTO unicode_test (testvalue) VALUES ('test');
29-
ERROR: plpython: function "unicode_trigger_error" could not modify tuple
29+
ERROR: PL/Python: could not compute string representation of Python object in PL/Python function "unicode_trigger_error" while modifying trigger row
3030
DETAIL: <type 'exceptions.UnicodeEncodeError'>: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)
3131
SELECT unicode_plan_error1();
32-
WARNING: plpython: in function unicode_plan_error1:
33-
DETAIL: <class 'plpy.Error'>: Unknown error in PLy_spi_execute_plan
34-
ERROR: plpython: function "unicode_plan_error1" could not execute plan
32+
WARNING: PL/Python: in PL/Python function "unicode_plan_error1"
33+
DETAIL: <class 'plpy.Error'>: unrecognized error in PLy_spi_execute_plan
34+
ERROR: PL/Python: PL/Python function "unicode_plan_error1" could not execute plan
3535
DETAIL: <type 'exceptions.UnicodeEncodeError'>: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)
3636
SELECT unicode_plan_error2();
37-
ERROR: plpython: function "unicode_plan_error2" could not execute plan
37+
ERROR: PL/Python: PL/Python function "unicode_plan_error2" could not execute plan
3838
DETAIL: <type 'exceptions.UnicodeEncodeError'>: 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128)

0 commit comments

Comments
 (0)