From 4ab6ebf3f4dc8182556dc23c49ee59e602a78f1c Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sat, 12 Sep 2009 22:13:12 +0000 Subject: Add Unicode support in PL/Python PL/Python now accepts Unicode objects where it previously only accepted string objects (for example, as return value). Unicode objects are converted to the PostgreSQL server encoding as necessary. This change is also necessary for future Python 3 support, which treats all strings as Unicode objects. Since this removes the error conditions that the plpython_unicode test file tested for, the alternative result files are no longer necessary. --- src/pl/plpython/expected/plpython_unicode.out | 59 +++++++++++++++------------ 1 file changed, 32 insertions(+), 27 deletions(-) (limited to 'src/pl/plpython/expected/plpython_unicode.out') diff --git a/src/pl/plpython/expected/plpython_unicode.out b/src/pl/plpython/expected/plpython_unicode.out index d3b6fd1db7..c4ab73fd24 100644 --- a/src/pl/plpython/expected/plpython_unicode.out +++ b/src/pl/plpython/expected/plpython_unicode.out @@ -4,42 +4,47 @@ CREATE TABLE unicode_test ( testvalue text NOT NULL ); -CREATE FUNCTION unicode_return_error() RETURNS text AS E' +CREATE FUNCTION unicode_return() RETURNS text AS E' return u"\\x80" ' LANGUAGE plpythonu; -CREATE FUNCTION unicode_trigger_error() RETURNS trigger AS E' +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_error(); -CREATE FUNCTION unicode_plan_error1() RETURNS text AS E' + 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_plan_error2() RETURNS text AS E' -plan = plpy.prepare("SELECT $1 AS testvalue1, $2 AS testvalue2", ["text", "text"]) -rv = plpy.execute(plan, u"\\x80", 1) -return rv[0]["testvalue1"] +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(); -ERROR: PL/Python: could not create string representation of Python object -DETAIL: : '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_error" +SELECT unicode_return(); + unicode_return +---------------- + \u0080 +(1 row) + INSERT INTO unicode_test (testvalue) VALUES ('test'); -ERROR: PL/Python: could not create string representation of Python object -DETAIL: : '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_error" -SELECT unicode_plan_error1(); -WARNING: PL/Python: : unrecognized error in PLy_spi_execute_plan -CONTEXT: PL/Python function "unicode_plan_error1" -ERROR: PL/Python: could not execute plan -DETAIL: : 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128) -CONTEXT: PL/Python function "unicode_plan_error1" -SELECT unicode_plan_error2(); -ERROR: PL/Python: could not execute plan -DETAIL: : 'ascii' codec can't encode character u'\x80' in position 0: ordinal not in range(128) -CONTEXT: PL/Python function "unicode_plan_error2" +SELECT * FROM unicode_test; + testvalue +----------- + \u0080 +(1 row) + +SELECT unicode_plan1(); + unicode_plan1 +--------------- + \u0080 +(1 row) + +SELECT unicode_plan2(); + unicode_plan2 +--------------- + foobar +(1 row) + -- cgit v1.2.1