Set client encoding explicitly in plpython_unicode test

This will (hopefully) eliminate the need for the
plpython_unicode_0.out expected file.
This commit is contained in:
Peter Eisentraut 2011-04-16 21:52:10 +03:00
parent 4b6106ccfe
commit 5809a64584
5 changed files with 5 additions and 52 deletions

View File

@ -2,8 +2,7 @@ Guide to alternative expected files:
plpython_error_0.out Python 2.4 and older plpython_error_0.out Python 2.4 and older
plpython_unicode.out server encoding != SQL_ASCII and client encoding == UTF8; else ... plpython_unicode.out server encoding != SQL_ASCII
plpython_unicode_0.out server encoding != SQL_ASCII and client encoding != UTF8; else ...
plpython_unicode_3.out server encoding == SQL_ASCII plpython_unicode_3.out server encoding == SQL_ASCII
plpython_subtransaction_0.out Python 2.4 and older (without with statement) plpython_subtransaction_0.out Python 2.4 and older (without with statement)

View File

@ -1,6 +1,7 @@
-- --
-- Unicode handling -- Unicode handling
-- --
SET client_encoding TO UTF8;
CREATE TABLE unicode_test ( CREATE TABLE unicode_test (
testvalue text NOT NULL testvalue text NOT NULL
); );

View File

@ -1,50 +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();
unicode_return
----------------
(1 row)
INSERT INTO unicode_test (testvalue) VALUES ('test');
SELECT * FROM unicode_test;
testvalue
-----------
(1 row)
SELECT unicode_plan1();
unicode_plan1
---------------
(1 row)
SELECT unicode_plan2();
unicode_plan2
---------------
foobar
(1 row)

View File

@ -1,6 +1,7 @@
-- --
-- Unicode handling -- Unicode handling
-- --
SET client_encoding TO UTF8;
CREATE TABLE unicode_test ( CREATE TABLE unicode_test (
testvalue text NOT NULL testvalue text NOT NULL
); );

View File

@ -2,6 +2,8 @@
-- Unicode handling -- Unicode handling
-- --
SET client_encoding TO UTF8;
CREATE TABLE unicode_test ( CREATE TABLE unicode_test (
testvalue text NOT NULL testvalue text NOT NULL
); );