mirror of
https://github.com/postgres/postgres.git
synced 2025-06-07 11:02:12 +03:00
Suppress indentation from Data::Dumper in regression tests
Ultra-modern versions of the perl Data::Dumper module have apparently changed how they indent output. Instead of trying to keep up we choose to tell it to supporess all indentation in the hstore_plperl regression tests. Backpatch to 9.5 where this feature was introduced.
This commit is contained in:
parent
fa9207c741
commit
b3c8630f11
@ -20,15 +20,12 @@ TRANSFORM FOR TYPE hstore
|
|||||||
AS $$
|
AS $$
|
||||||
use Data::Dumper;
|
use Data::Dumper;
|
||||||
$Data::Dumper::Sortkeys = 1;
|
$Data::Dumper::Sortkeys = 1;
|
||||||
|
$Data::Dumper::Indent = 0;
|
||||||
elog(INFO, Dumper($_[0]));
|
elog(INFO, Dumper($_[0]));
|
||||||
return scalar(keys %{$_[0]});
|
return scalar(keys %{$_[0]});
|
||||||
$$;
|
$$;
|
||||||
SELECT test1('aa=>bb, cc=>NULL'::hstore);
|
SELECT test1('aa=>bb, cc=>NULL'::hstore);
|
||||||
INFO: $VAR1 = {
|
INFO: $VAR1 = {'aa' => 'bb','cc' => undef};
|
||||||
'aa' => 'bb',
|
|
||||||
'cc' => undef
|
|
||||||
};
|
|
||||||
|
|
||||||
CONTEXT: PL/Perl function "test1"
|
CONTEXT: PL/Perl function "test1"
|
||||||
test1
|
test1
|
||||||
-------
|
-------
|
||||||
@ -40,12 +37,12 @@ LANGUAGE plperlu
|
|||||||
AS $$
|
AS $$
|
||||||
use Data::Dumper;
|
use Data::Dumper;
|
||||||
$Data::Dumper::Sortkeys = 1;
|
$Data::Dumper::Sortkeys = 1;
|
||||||
|
$Data::Dumper::Indent = 0;
|
||||||
elog(INFO, Dumper($_[0]));
|
elog(INFO, Dumper($_[0]));
|
||||||
return scalar(keys %{$_[0]});
|
return scalar(keys %{$_[0]});
|
||||||
$$;
|
$$;
|
||||||
SELECT test1none('aa=>bb, cc=>NULL'::hstore);
|
SELECT test1none('aa=>bb, cc=>NULL'::hstore);
|
||||||
INFO: $VAR1 = '"aa"=>"bb", "cc"=>NULL';
|
INFO: $VAR1 = '"aa"=>"bb", "cc"=>NULL';
|
||||||
|
|
||||||
CONTEXT: PL/Perl function "test1none"
|
CONTEXT: PL/Perl function "test1none"
|
||||||
test1none
|
test1none
|
||||||
-----------
|
-----------
|
||||||
@ -58,15 +55,12 @@ TRANSFORM FOR TYPE hstore
|
|||||||
AS $$
|
AS $$
|
||||||
use Data::Dumper;
|
use Data::Dumper;
|
||||||
$Data::Dumper::Sortkeys = 1;
|
$Data::Dumper::Sortkeys = 1;
|
||||||
|
$Data::Dumper::Indent = 0;
|
||||||
elog(INFO, Dumper($_[0]));
|
elog(INFO, Dumper($_[0]));
|
||||||
return scalar(keys %{$_[0]});
|
return scalar(keys %{$_[0]});
|
||||||
$$;
|
$$;
|
||||||
SELECT test1list('aa=>bb, cc=>NULL'::hstore);
|
SELECT test1list('aa=>bb, cc=>NULL'::hstore);
|
||||||
INFO: $VAR1 = {
|
INFO: $VAR1 = {'aa' => 'bb','cc' => undef};
|
||||||
'aa' => 'bb',
|
|
||||||
'cc' => undef
|
|
||||||
};
|
|
||||||
|
|
||||||
CONTEXT: PL/Perl function "test1list"
|
CONTEXT: PL/Perl function "test1list"
|
||||||
test1list
|
test1list
|
||||||
-----------
|
-----------
|
||||||
@ -80,18 +74,12 @@ TRANSFORM FOR TYPE hstore
|
|||||||
AS $$
|
AS $$
|
||||||
use Data::Dumper;
|
use Data::Dumper;
|
||||||
$Data::Dumper::Sortkeys = 1;
|
$Data::Dumper::Sortkeys = 1;
|
||||||
|
$Data::Dumper::Indent = 0;
|
||||||
elog(INFO, Dumper($_[0]->[0], $_[0]->[1]));
|
elog(INFO, Dumper($_[0]->[0], $_[0]->[1]));
|
||||||
return scalar(keys %{$_[0]});
|
return scalar(keys %{$_[0]});
|
||||||
$$;
|
$$;
|
||||||
SELECT test1arr(array['aa=>bb, cc=>NULL'::hstore, 'dd=>ee']);
|
SELECT test1arr(array['aa=>bb, cc=>NULL'::hstore, 'dd=>ee']);
|
||||||
INFO: $VAR1 = {
|
INFO: $VAR1 = {'aa' => 'bb','cc' => undef};$VAR2 = {'dd' => 'ee'};
|
||||||
'aa' => 'bb',
|
|
||||||
'cc' => undef
|
|
||||||
};
|
|
||||||
$VAR2 = {
|
|
||||||
'dd' => 'ee'
|
|
||||||
};
|
|
||||||
|
|
||||||
CONTEXT: PL/Perl function "test1arr"
|
CONTEXT: PL/Perl function "test1arr"
|
||||||
test1arr
|
test1arr
|
||||||
----------
|
----------
|
||||||
@ -105,6 +93,7 @@ TRANSFORM FOR TYPE hstore
|
|||||||
AS $$
|
AS $$
|
||||||
use Data::Dumper;
|
use Data::Dumper;
|
||||||
$Data::Dumper::Sortkeys = 1;
|
$Data::Dumper::Sortkeys = 1;
|
||||||
|
$Data::Dumper::Indent = 0;
|
||||||
|
|
||||||
$rv = spi_exec_query(q{SELECT 'aa=>bb, cc=>NULL'::hstore AS col1});
|
$rv = spi_exec_query(q{SELECT 'aa=>bb, cc=>NULL'::hstore AS col1});
|
||||||
elog(INFO, Dumper($rv->{rows}[0]->{col1}));
|
elog(INFO, Dumper($rv->{rows}[0]->{col1}));
|
||||||
@ -115,14 +104,9 @@ $rv = spi_exec_prepared($plan, {}, $val);
|
|||||||
elog(INFO, Dumper($rv->{rows}[0]->{col1}));
|
elog(INFO, Dumper($rv->{rows}[0]->{col1}));
|
||||||
$$;
|
$$;
|
||||||
SELECT test3();
|
SELECT test3();
|
||||||
INFO: $VAR1 = {
|
INFO: $VAR1 = {'aa' => 'bb','cc' => undef};
|
||||||
'aa' => 'bb',
|
|
||||||
'cc' => undef
|
|
||||||
};
|
|
||||||
|
|
||||||
CONTEXT: PL/Perl function "test3"
|
CONTEXT: PL/Perl function "test3"
|
||||||
INFO: $VAR1 = '"a"=>"1", "b"=>"boo", "c"=>NULL';
|
INFO: $VAR1 = '"a"=>"1", "b"=>"boo", "c"=>NULL';
|
||||||
|
|
||||||
CONTEXT: PL/Perl function "test3"
|
CONTEXT: PL/Perl function "test3"
|
||||||
test3
|
test3
|
||||||
-------
|
-------
|
||||||
@ -144,6 +128,7 @@ TRANSFORM FOR TYPE hstore
|
|||||||
AS $$
|
AS $$
|
||||||
use Data::Dumper;
|
use Data::Dumper;
|
||||||
$Data::Dumper::Sortkeys = 1;
|
$Data::Dumper::Sortkeys = 1;
|
||||||
|
$Data::Dumper::Indent = 0;
|
||||||
elog(INFO, Dumper($_TD->{new}));
|
elog(INFO, Dumper($_TD->{new}));
|
||||||
if ($_TD->{new}{a} == 1) {
|
if ($_TD->{new}{a} == 1) {
|
||||||
$_TD->{new}{b} = {a => 1, b => 'boo', c => undef};
|
$_TD->{new}{b} = {a => 1, b => 'boo', c => undef};
|
||||||
@ -153,14 +138,7 @@ return "MODIFY";
|
|||||||
$$;
|
$$;
|
||||||
CREATE TRIGGER test4 BEFORE UPDATE ON test1 FOR EACH ROW EXECUTE PROCEDURE test4();
|
CREATE TRIGGER test4 BEFORE UPDATE ON test1 FOR EACH ROW EXECUTE PROCEDURE test4();
|
||||||
UPDATE test1 SET a = a;
|
UPDATE test1 SET a = a;
|
||||||
INFO: $VAR1 = {
|
INFO: $VAR1 = {'a' => '1','b' => {'aa' => 'bb','cc' => undef}};
|
||||||
'a' => '1',
|
|
||||||
'b' => {
|
|
||||||
'aa' => 'bb',
|
|
||||||
'cc' => undef
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
CONTEXT: PL/Perl function "test4"
|
CONTEXT: PL/Perl function "test4"
|
||||||
SELECT * FROM test1;
|
SELECT * FROM test1;
|
||||||
a | b
|
a | b
|
||||||
|
@ -17,6 +17,7 @@ TRANSFORM FOR TYPE hstore
|
|||||||
AS $$
|
AS $$
|
||||||
use Data::Dumper;
|
use Data::Dumper;
|
||||||
$Data::Dumper::Sortkeys = 1;
|
$Data::Dumper::Sortkeys = 1;
|
||||||
|
$Data::Dumper::Indent = 0;
|
||||||
elog(INFO, Dumper($_[0]));
|
elog(INFO, Dumper($_[0]));
|
||||||
return scalar(keys %{$_[0]});
|
return scalar(keys %{$_[0]});
|
||||||
$$;
|
$$;
|
||||||
@ -28,6 +29,7 @@ LANGUAGE plperlu
|
|||||||
AS $$
|
AS $$
|
||||||
use Data::Dumper;
|
use Data::Dumper;
|
||||||
$Data::Dumper::Sortkeys = 1;
|
$Data::Dumper::Sortkeys = 1;
|
||||||
|
$Data::Dumper::Indent = 0;
|
||||||
elog(INFO, Dumper($_[0]));
|
elog(INFO, Dumper($_[0]));
|
||||||
return scalar(keys %{$_[0]});
|
return scalar(keys %{$_[0]});
|
||||||
$$;
|
$$;
|
||||||
@ -40,6 +42,7 @@ TRANSFORM FOR TYPE hstore
|
|||||||
AS $$
|
AS $$
|
||||||
use Data::Dumper;
|
use Data::Dumper;
|
||||||
$Data::Dumper::Sortkeys = 1;
|
$Data::Dumper::Sortkeys = 1;
|
||||||
|
$Data::Dumper::Indent = 0;
|
||||||
elog(INFO, Dumper($_[0]));
|
elog(INFO, Dumper($_[0]));
|
||||||
return scalar(keys %{$_[0]});
|
return scalar(keys %{$_[0]});
|
||||||
$$;
|
$$;
|
||||||
@ -54,6 +57,7 @@ TRANSFORM FOR TYPE hstore
|
|||||||
AS $$
|
AS $$
|
||||||
use Data::Dumper;
|
use Data::Dumper;
|
||||||
$Data::Dumper::Sortkeys = 1;
|
$Data::Dumper::Sortkeys = 1;
|
||||||
|
$Data::Dumper::Indent = 0;
|
||||||
elog(INFO, Dumper($_[0]->[0], $_[0]->[1]));
|
elog(INFO, Dumper($_[0]->[0], $_[0]->[1]));
|
||||||
return scalar(keys %{$_[0]});
|
return scalar(keys %{$_[0]});
|
||||||
$$;
|
$$;
|
||||||
@ -68,6 +72,7 @@ TRANSFORM FOR TYPE hstore
|
|||||||
AS $$
|
AS $$
|
||||||
use Data::Dumper;
|
use Data::Dumper;
|
||||||
$Data::Dumper::Sortkeys = 1;
|
$Data::Dumper::Sortkeys = 1;
|
||||||
|
$Data::Dumper::Indent = 0;
|
||||||
|
|
||||||
$rv = spi_exec_query(q{SELECT 'aa=>bb, cc=>NULL'::hstore AS col1});
|
$rv = spi_exec_query(q{SELECT 'aa=>bb, cc=>NULL'::hstore AS col1});
|
||||||
elog(INFO, Dumper($rv->{rows}[0]->{col1}));
|
elog(INFO, Dumper($rv->{rows}[0]->{col1}));
|
||||||
@ -92,6 +97,7 @@ TRANSFORM FOR TYPE hstore
|
|||||||
AS $$
|
AS $$
|
||||||
use Data::Dumper;
|
use Data::Dumper;
|
||||||
$Data::Dumper::Sortkeys = 1;
|
$Data::Dumper::Sortkeys = 1;
|
||||||
|
$Data::Dumper::Indent = 0;
|
||||||
elog(INFO, Dumper($_TD->{new}));
|
elog(INFO, Dumper($_TD->{new}));
|
||||||
if ($_TD->{new}{a} == 1) {
|
if ($_TD->{new}{a} == 1) {
|
||||||
$_TD->{new}{b} = {a => 1, b => 'boo', c => undef};
|
$_TD->{new}{b} = {a => 1, b => 'boo', c => undef};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user