git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/pl/plpython/expected/README b/src/pl/plpython/expected/README

index 031b77dd0ab8671be7a7f6400859dd3c2dead74d..11424877b6f880b34d9779f5213f909e0a73ea67 100644 (file)

--- a/src/pl/plpython/expected/README

+++ b/src/pl/plpython/expected/README

plpython_error_0.out Python 2.4 and older

-plpython_unicode.out server encoding != SQL_ASCII and client encoding == UTF8; else ...

-plpython_unicode_0.out server encoding != SQL_ASCII and client encoding != UTF8; else ...

+plpython_unicode.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)

diff --git a/src/pl/plpython/expected/plpython_unicode.out b/src/pl/plpython/expected/plpython_unicode.out

index c4ab73fd246da811d82941b027bf0cf891f31720..859edbbbaa81eeb66a43225712c7a1fad4657d8d 100644 (file)

--- a/src/pl/plpython/expected/plpython_unicode.out

+++ b/src/pl/plpython/expected/plpython_unicode.out

--

-- Unicode handling

--

+SET client_encoding TO UTF8;

CREATE TABLE unicode_test (

testvalue text NOT NULL

);

diff --git a/src/pl/plpython/expected/plpython_unicode_0.out b/src/pl/plpython/expected/plpython_unicode_0.out

deleted file mode 100644 (file)
index b1c6e39..0000000

--- a/src/pl/plpython/expected/plpython_unicode_0.out

+++ /dev/null

---

--- 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

-----------------

- 80円

-(1 row)

-

-INSERT INTO unicode_test (testvalue) VALUES ('test');

-SELECT * FROM unicode_test;

- testvalue

------------

- 80円

-(1 row)

-

-SELECT unicode_plan1();

- unicode_plan1

----------------

- 80円

-(1 row)

-

-SELECT unicode_plan2();

- unicode_plan2

----------------

- foobar

-(1 row)

-

diff --git a/src/pl/plpython/expected/plpython_unicode_3.out b/src/pl/plpython/expected/plpython_unicode_3.out

index d023bc9b73a465809c9191fe48ac336ebd8da7e3..52d0aa0b1e47f9cb72fbb6934aae502ec22bc71d 100644 (file)

--- a/src/pl/plpython/expected/plpython_unicode_3.out

+++ b/src/pl/plpython/expected/plpython_unicode_3.out

--

-- Unicode handling

--

+SET client_encoding TO UTF8;

CREATE TABLE unicode_test (

testvalue text NOT NULL

);

diff --git a/src/pl/plpython/sql/plpython_unicode.sql b/src/pl/plpython/sql/plpython_unicode.sql

index 6b9fac682a26353821050dacc1d9f6ee7e142267..bdd40c40a56b7e6a215e4e22e1790680e6fdd41a 100644 (file)

--- a/src/pl/plpython/sql/plpython_unicode.sql

+++ b/src/pl/plpython/sql/plpython_unicode.sql

-- Unicode handling

--

+SET client_encoding TO UTF8;

+

CREATE TABLE unicode_test (

testvalue text NOT NULL

);