From eac93e20afe434a79e81558c17a7a1408cf9d74a Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 4 Apr 2018 11:51:36 -0400 Subject: [PATCH] Remove less-portable-than-believed test case. In commit 331b2369c I added a test to see what jsonb_plperl would do with a qr{} result. Turns out the answer is Perl version dependent. That fact doesn't bother me particularly, but coping with multiple result possibilities is way more work than this test seems worth. So remove it again. Discussion: https://postgr.es/m/E1f3MMJ-0006bf-B0@gemulon.postgresql.org --- contrib/jsonb_plperl/expected/jsonb_plperl.out | 13 +------------ contrib/jsonb_plperl/expected/jsonb_plperlu.out | 13 +------------ contrib/jsonb_plperl/sql/jsonb_plperl.sql | 12 ------------ contrib/jsonb_plperl/sql/jsonb_plperlu.sql | 12 ------------ 4 files changed, 2 insertions(+), 48 deletions(-) diff --git a/contrib/jsonb_plperl/expected/jsonb_plperl.out b/contrib/jsonb_plperl/expected/jsonb_plperl.out index 79d53e5e50..99a2e8e135 100644 --- a/contrib/jsonb_plperl/expected/jsonb_plperl.out +++ b/contrib/jsonb_plperl/expected/jsonb_plperl.out @@ -39,17 +39,6 @@ SELECT testSVToJsonb(); 1 (1 row) --- unsupported (for now) -CREATE FUNCTION testRegexpToJsonb() RETURNS jsonb -LANGUAGE plperl -TRANSFORM FOR TYPE jsonb -AS $$ -my $a = qr/foo/; -return ($a); -$$; -SELECT testRegexpToJsonb(); -ERROR: cannot transform this Perl type to jsonb -CONTEXT: PL/Perl function "testregexptojsonb" -- this revealed a bug in the original implementation CREATE FUNCTION testRegexpResultToJsonb() RETURNS jsonb LANGUAGE plperl @@ -218,4 +207,4 @@ SELECT roundtrip('{"1": {"2": [3, 4, 5]}, "2": 3}'); \set VERBOSITY terse \\ -- suppress cascade details DROP EXTENSION plperl CASCADE; -NOTICE: drop cascades to 7 other objects +NOTICE: drop cascades to 6 other objects diff --git a/contrib/jsonb_plperl/expected/jsonb_plperlu.out b/contrib/jsonb_plperl/expected/jsonb_plperlu.out index e842a03396..8053cf6aa8 100644 --- a/contrib/jsonb_plperl/expected/jsonb_plperlu.out +++ b/contrib/jsonb_plperl/expected/jsonb_plperlu.out @@ -39,17 +39,6 @@ SELECT testSVToJsonb(); 1 (1 row) --- unsupported (for now) -CREATE FUNCTION testRegexpToJsonb() RETURNS jsonb -LANGUAGE plperlu -TRANSFORM FOR TYPE jsonb -AS $$ -my $a = qr/foo/; -return ($a); -$$; -SELECT testRegexpToJsonb(); -ERROR: cannot transform this Perl type to jsonb -CONTEXT: PL/Perl function "testregexptojsonb" -- this revealed a bug in the original implementation CREATE FUNCTION testRegexpResultToJsonb() RETURNS jsonb LANGUAGE plperlu @@ -218,4 +207,4 @@ SELECT roundtrip('{"1": {"2": [3, 4, 5]}, "2": 3}'); \set VERBOSITY terse \\ -- suppress cascade details DROP EXTENSION plperlu CASCADE; -NOTICE: drop cascades to 7 other objects +NOTICE: drop cascades to 6 other objects diff --git a/contrib/jsonb_plperl/sql/jsonb_plperl.sql b/contrib/jsonb_plperl/sql/jsonb_plperl.sql index 9993132ef0..8b0a8764af 100644 --- a/contrib/jsonb_plperl/sql/jsonb_plperl.sql +++ b/contrib/jsonb_plperl/sql/jsonb_plperl.sql @@ -34,18 +34,6 @@ $$; SELECT testSVToJsonb(); --- unsupported (for now) -CREATE FUNCTION testRegexpToJsonb() RETURNS jsonb -LANGUAGE plperl -TRANSFORM FOR TYPE jsonb -AS $$ -my $a = qr/foo/; -return ($a); -$$; - -SELECT testRegexpToJsonb(); - - -- this revealed a bug in the original implementation CREATE FUNCTION testRegexpResultToJsonb() RETURNS jsonb LANGUAGE plperl diff --git a/contrib/jsonb_plperl/sql/jsonb_plperlu.sql b/contrib/jsonb_plperl/sql/jsonb_plperlu.sql index ab7d2e76e8..9287f7672f 100644 --- a/contrib/jsonb_plperl/sql/jsonb_plperlu.sql +++ b/contrib/jsonb_plperl/sql/jsonb_plperlu.sql @@ -34,18 +34,6 @@ $$; SELECT testSVToJsonb(); --- unsupported (for now) -CREATE FUNCTION testRegexpToJsonb() RETURNS jsonb -LANGUAGE plperlu -TRANSFORM FOR TYPE jsonb -AS $$ -my $a = qr/foo/; -return ($a); -$$; - -SELECT testRegexpToJsonb(); - - -- this revealed a bug in the original implementation CREATE FUNCTION testRegexpResultToJsonb() RETURNS jsonb LANGUAGE plperlu -- 2.30.2