From 82b7faa3b207193dc98d9dd5a5c8b64710ebc1a4 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Tue, 17 Jul 2012 12:31:48 -0400 Subject: [PATCH] Remove recently added PL/Perl encoding tests These only pass cleanly on UTF8 and SQL_ASCII encodings, besides the Japanese encoding in which they were originally written, which is clearly not good enough. Since the functionality they test has not ever been tested from PL/Perl, the best answer seems to be to remove the new tests completely. Per buildfarm results and ensuing discussion. --- src/pl/plperl/expected/plperl_lc.out | 23 ------------------- src/pl/plperl/expected/plperl_lc_1.out | 31 -------------------------- src/pl/plperl/sql/plperl_lc.sql | 16 ------------- 3 files changed, 70 deletions(-) diff --git a/src/pl/plperl/expected/plperl_lc.out b/src/pl/plperl/expected/plperl_lc.out index 8557b4655a5..4f8c08f1c94 100644 --- a/src/pl/plperl/expected/plperl_lc.out +++ b/src/pl/plperl/expected/plperl_lc.out @@ -8,26 +8,3 @@ $$ LANGUAGE plperl; SELECT perl_zerob(); ERROR: invalid byte sequence for encoding "UTF8": 0x00 CONTEXT: PL/Perl function "perl_zerob" -CREATE OR REPLACE FUNCTION perl_0x80_in(text) RETURNS BOOL AS $$ - return ($_[0] eq "abc\x80de" ? "true" : "false"); -$$ LANGUAGE plperl; -SELECT perl_0x80_in(E'abc\x80de'); -ERROR: invalid byte sequence for encoding "UTF8": 0x80 -CREATE OR REPLACE FUNCTION perl_0x80_out() RETURNS TEXT AS $$ - return "abc\x80de"; -$$ LANGUAGE plperl; -SELECT perl_0x80_out() = E'abc\x80de'; -ERROR: invalid byte sequence for encoding "UTF8": 0x80 -CREATE OR REPLACE FUNCTION perl_utf_inout(text) RETURNS TEXT AS $$ - $str = $_[0]; $code = "NotUTF8:"; $match = "ab\xe5\xb1\xb1cd"; - if (utf8::is_utf8($str)) { - $code = "UTF8:"; utf8::decode($str); $match="ab\x{5c71}cd"; - } - return ($str ne $match ? $code."DIFFER" : $code."ab\x{5ddd}cd"); -$$ LANGUAGE plperl; -SELECT encode(perl_utf_inout(E'ab\xe5\xb1\xb1cd')::bytea, 'escape') - encode ------------------------ - UTF8:ab\345\267\235cd -(1 row) - diff --git a/src/pl/plperl/expected/plperl_lc_1.out b/src/pl/plperl/expected/plperl_lc_1.out index c454c4409ed..022c3e2de79 100644 --- a/src/pl/plperl/expected/plperl_lc_1.out +++ b/src/pl/plperl/expected/plperl_lc_1.out @@ -8,34 +8,3 @@ $$ LANGUAGE plperl; SELECT perl_zerob(); ERROR: invalid byte sequence for encoding "SQL_ASCII": 0x00 CONTEXT: PL/Perl function "perl_zerob" -CREATE OR REPLACE FUNCTION perl_0x80_in(text) RETURNS BOOL AS $$ - return ($_[0] eq "abc\x80de" ? "true" : "false"); -$$ LANGUAGE plperl; -SELECT perl_0x80_in(E'abc\x80de'); - perl_0x80_in --------------- - t -(1 row) - -CREATE OR REPLACE FUNCTION perl_0x80_out() RETURNS TEXT AS $$ - return "abc\x80de"; -$$ LANGUAGE plperl; -SELECT perl_0x80_out() = E'abc\x80de'; - ?column? ----------- - t -(1 row) - -CREATE OR REPLACE FUNCTION perl_utf_inout(text) RETURNS TEXT AS $$ - $str = $_[0]; $code = "NotUTF8:"; $match = "ab\xe5\xb1\xb1cd"; - if (utf8::is_utf8($str)) { - $code = "UTF8:"; utf8::decode($str); $match="ab\x{5c71}cd"; - } - return ($str ne $match ? $code."DIFFER" : $code."ab\x{5ddd}cd"); -$$ LANGUAGE plperl; -SELECT encode(perl_utf_inout(E'ab\xe5\xb1\xb1cd')::bytea, 'escape') - encode --------------------------- - NotUTF8:ab\345\267\235cd -(1 row) - diff --git a/src/pl/plperl/sql/plperl_lc.sql b/src/pl/plperl/sql/plperl_lc.sql index fd75bc0d703..a4a06e722f8 100644 --- a/src/pl/plperl/sql/plperl_lc.sql +++ b/src/pl/plperl/sql/plperl_lc.sql @@ -6,19 +6,3 @@ CREATE OR REPLACE FUNCTION perl_zerob() RETURNS TEXT AS $$ return "abcd\0efg"; $$ LANGUAGE plperl; SELECT perl_zerob(); -CREATE OR REPLACE FUNCTION perl_0x80_in(text) RETURNS BOOL AS $$ - return ($_[0] eq "abc\x80de" ? "true" : "false"); -$$ LANGUAGE plperl; -SELECT perl_0x80_in(E'abc\x80de'); -CREATE OR REPLACE FUNCTION perl_0x80_out() RETURNS TEXT AS $$ - return "abc\x80de"; -$$ LANGUAGE plperl; -SELECT perl_0x80_out() = E'abc\x80de'; -CREATE OR REPLACE FUNCTION perl_utf_inout(text) RETURNS TEXT AS $$ - $str = $_[0]; $code = "NotUTF8:"; $match = "ab\xe5\xb1\xb1cd"; - if (utf8::is_utf8($str)) { - $code = "UTF8:"; utf8::decode($str); $match="ab\x{5c71}cd"; - } - return ($str ne $match ? $code."DIFFER" : $code."ab\x{5ddd}cd"); -$$ LANGUAGE plperl; -SELECT encode(perl_utf_inout(E'ab\xe5\xb1\xb1cd')::bytea, 'escape')