mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust plpython for escape_string_warning.

Browse Source
This commit is contained in:
Bruce Momjian 2006-03-08 04:01:29 +00:00
parent bc0be355c8
commit c574106a66
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pl/plpython/expected/plpython_function.out
View File

@ -270,21 +270,21 @@ LANGUAGE plpythonu;
-- --
-- Unicode error handling -- Unicode error handling
-- --
CREATE FUNCTION unicode_return_error() RETURNS text AS ' CREATE FUNCTION unicode_return_error() RETURNS text AS E'
return u"\\x80" return u"\\x80"
' LANGUAGE plpythonu; ' LANGUAGE plpythonu;
CREATE FUNCTION unicode_trigger_error() RETURNS trigger AS ' CREATE FUNCTION unicode_trigger_error() RETURNS trigger AS E'
TD["new"]["testvalue"] = u"\\x80" TD["new"]["testvalue"] = u"\\x80"
return "MODIFY" return "MODIFY"
' LANGUAGE plpythonu; ' LANGUAGE plpythonu;
CREATE TRIGGER unicode_test_bi BEFORE INSERT ON unicode_test CREATE TRIGGER unicode_test_bi BEFORE INSERT ON unicode_test
FOR EACH ROW EXECUTE PROCEDURE unicode_trigger_error(); FOR EACH ROW EXECUTE PROCEDURE unicode_trigger_error();
CREATE FUNCTION unicode_plan_error1() RETURNS text AS ' CREATE FUNCTION unicode_plan_error1() RETURNS text AS E'
plan = plpy.prepare("SELECT $1 AS testvalue", ["text"]) plan = plpy.prepare("SELECT $1 AS testvalue", ["text"])
rv = plpy.execute(plan, [u"\\x80"], 1) rv = plpy.execute(plan, [u"\\x80"], 1)
return rv[0]["testvalue"] return rv[0]["testvalue"]
' LANGUAGE plpythonu; ' LANGUAGE plpythonu;
CREATE FUNCTION unicode_plan_error2() RETURNS text AS ' CREATE FUNCTION unicode_plan_error2() RETURNS text AS E'
plan = plpy.prepare("SELECT $1 AS testvalue1, $2 AS testvalue2", ["text", "text"]) plan = plpy.prepare("SELECT $1 AS testvalue1, $2 AS testvalue2", ["text", "text"])
rv = plpy.execute(plan, u"\\x80", 1) rv = plpy.execute(plan, u"\\x80", 1)
return rv[0]["testvalue1"] return rv[0]["testvalue1"]

8
src/pl/plpython/sql/plpython_function.sql
View File

@ -318,11 +318,11 @@ LANGUAGE plpythonu;
-- Unicode error handling -- Unicode error handling
-- --
CREATE FUNCTION unicode_return_error() RETURNS text AS ' CREATE FUNCTION unicode_return_error() RETURNS text AS E'
return u"\\x80" return u"\\x80"
' LANGUAGE plpythonu; ' LANGUAGE plpythonu;
CREATE FUNCTION unicode_trigger_error() RETURNS trigger AS ' CREATE FUNCTION unicode_trigger_error() RETURNS trigger AS E'
TD["new"]["testvalue"] = u"\\x80" TD["new"]["testvalue"] = u"\\x80"
return "MODIFY" return "MODIFY"
' LANGUAGE plpythonu; ' LANGUAGE plpythonu;
@ -330,13 +330,13 @@ return "MODIFY"
CREATE TRIGGER unicode_test_bi BEFORE INSERT ON unicode_test CREATE TRIGGER unicode_test_bi BEFORE INSERT ON unicode_test
FOR EACH ROW EXECUTE PROCEDURE unicode_trigger_error(); FOR EACH ROW EXECUTE PROCEDURE unicode_trigger_error();
CREATE FUNCTION unicode_plan_error1() RETURNS text AS ' CREATE FUNCTION unicode_plan_error1() RETURNS text AS E'
plan = plpy.prepare("SELECT $1 AS testvalue", ["text"]) plan = plpy.prepare("SELECT $1 AS testvalue", ["text"])
rv = plpy.execute(plan, [u"\\x80"], 1) rv = plpy.execute(plan, [u"\\x80"], 1)
return rv[0]["testvalue"] return rv[0]["testvalue"]
' LANGUAGE plpythonu; ' LANGUAGE plpythonu;
CREATE FUNCTION unicode_plan_error2() RETURNS text AS ' CREATE FUNCTION unicode_plan_error2() RETURNS text AS E'
plan = plpy.prepare("SELECT $1 AS testvalue1, $2 AS testvalue2", ["text", "text"]) plan = plpy.prepare("SELECT $1 AS testvalue1, $2 AS testvalue2", ["text", "text"])
rv = plpy.execute(plan, u"\\x80", 1) rv = plpy.execute(plan, u"\\x80", 1)
return rv[0]["testvalue1"] return rv[0]["testvalue1"]