mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-08-22 02:23:22 +02:00
Remove the code in plpgsql that suppressed the innermost line of CONTEXT for messages emitted by RAISE commands. That was never more than a quick backwards-compatibility hack, and it's pretty silly in cases where the RAISE is nested in several levels of function. What's more, it violated our design theory that verbosity of error reports should be controlled on the client side not the server side. To alleviate the resulting noise increase, introduce a feature in libpq and psql whereby the CONTEXT field of messages can be suppressed, either always or only for non-error messages. Printing CONTEXT for errors only is now their default behavior. The actual code changes here are pretty small, but the effects on the regression test outputs are widespread. I had to edit some of the alternative expected outputs by hand; hopefully the buildfarm will soon find anything I fat-fingered. In passing, fix up (again) the output line counts in psql's various help displays. Add some commentary about how to verify them. Pavel Stehule, reviewed by Petr Jelínek, Jeevan Chalke, and others
174 lines
4.0 KiB
Plaintext
174 lines
4.0 KiB
Plaintext
CREATE EXTENSION hstore;
|
|
CREATE EXTENSION plperlu;
|
|
CREATE EXTENSION hstore_plperlu;
|
|
SELECT transforms.udt_schema, transforms.udt_name,
|
|
routine_schema, routine_name,
|
|
group_name, transform_type
|
|
FROM information_schema.transforms JOIN information_schema.routines
|
|
USING (specific_catalog, specific_schema, specific_name)
|
|
ORDER BY 1, 2, 5, 6;
|
|
udt_schema | udt_name | routine_schema | routine_name | group_name | transform_type
|
|
------------+----------+----------------+-------------------+------------+----------------
|
|
public | hstore | public | hstore_to_plperlu | plperlu | FROM SQL
|
|
public | hstore | public | plperlu_to_hstore | plperlu | TO SQL
|
|
(2 rows)
|
|
|
|
-- test hstore -> perl
|
|
CREATE FUNCTION test1(val hstore) RETURNS int
|
|
LANGUAGE plperlu
|
|
TRANSFORM FOR TYPE hstore
|
|
AS $$
|
|
use Data::Dumper;
|
|
$Data::Dumper::Sortkeys = 1;
|
|
elog(INFO, Dumper($_[0]));
|
|
return scalar(keys %{$_[0]});
|
|
$$;
|
|
SELECT test1('aa=>bb, cc=>NULL'::hstore);
|
|
INFO: $VAR1 = {
|
|
'aa' => 'bb',
|
|
'cc' => undef
|
|
};
|
|
|
|
test1
|
|
-------
|
|
2
|
|
(1 row)
|
|
|
|
CREATE FUNCTION test1none(val hstore) RETURNS int
|
|
LANGUAGE plperlu
|
|
AS $$
|
|
use Data::Dumper;
|
|
$Data::Dumper::Sortkeys = 1;
|
|
elog(INFO, Dumper($_[0]));
|
|
return scalar(keys %{$_[0]});
|
|
$$;
|
|
SELECT test1none('aa=>bb, cc=>NULL'::hstore);
|
|
INFO: $VAR1 = '"aa"=>"bb", "cc"=>NULL';
|
|
|
|
test1none
|
|
-----------
|
|
0
|
|
(1 row)
|
|
|
|
CREATE FUNCTION test1list(val hstore) RETURNS int
|
|
LANGUAGE plperlu
|
|
TRANSFORM FOR TYPE hstore
|
|
AS $$
|
|
use Data::Dumper;
|
|
$Data::Dumper::Sortkeys = 1;
|
|
elog(INFO, Dumper($_[0]));
|
|
return scalar(keys %{$_[0]});
|
|
$$;
|
|
SELECT test1list('aa=>bb, cc=>NULL'::hstore);
|
|
INFO: $VAR1 = {
|
|
'aa' => 'bb',
|
|
'cc' => undef
|
|
};
|
|
|
|
test1list
|
|
-----------
|
|
2
|
|
(1 row)
|
|
|
|
-- test hstore[] -> perl
|
|
CREATE FUNCTION test1arr(val hstore[]) RETURNS int
|
|
LANGUAGE plperlu
|
|
TRANSFORM FOR TYPE hstore
|
|
AS $$
|
|
use Data::Dumper;
|
|
$Data::Dumper::Sortkeys = 1;
|
|
elog(INFO, Dumper($_[0]->[0], $_[0]->[1]));
|
|
return scalar(keys %{$_[0]});
|
|
$$;
|
|
SELECT test1arr(array['aa=>bb, cc=>NULL'::hstore, 'dd=>ee']);
|
|
INFO: $VAR1 = {
|
|
'aa' => 'bb',
|
|
'cc' => undef
|
|
};
|
|
$VAR2 = {
|
|
'dd' => 'ee'
|
|
};
|
|
|
|
test1arr
|
|
----------
|
|
2
|
|
(1 row)
|
|
|
|
-- test as part of prepare/execute
|
|
CREATE FUNCTION test3() RETURNS void
|
|
LANGUAGE plperlu
|
|
TRANSFORM FOR TYPE hstore
|
|
AS $$
|
|
use Data::Dumper;
|
|
$Data::Dumper::Sortkeys = 1;
|
|
|
|
$rv = spi_exec_query(q{SELECT 'aa=>bb, cc=>NULL'::hstore AS col1});
|
|
elog(INFO, Dumper($rv->{rows}[0]->{col1}));
|
|
|
|
$val = {a => 1, b => 'boo', c => undef};
|
|
$plan = spi_prepare(q{SELECT $1::text AS col1}, "hstore");
|
|
$rv = spi_exec_prepared($plan, {}, $val);
|
|
elog(INFO, Dumper($rv->{rows}[0]->{col1}));
|
|
$$;
|
|
SELECT test3();
|
|
INFO: $VAR1 = {
|
|
'aa' => 'bb',
|
|
'cc' => undef
|
|
};
|
|
|
|
INFO: $VAR1 = '"a"=>"1", "b"=>"boo", "c"=>NULL';
|
|
|
|
test3
|
|
-------
|
|
|
|
(1 row)
|
|
|
|
-- test trigger
|
|
CREATE TABLE test1 (a int, b hstore);
|
|
INSERT INTO test1 VALUES (1, 'aa=>bb, cc=>NULL');
|
|
SELECT * FROM test1;
|
|
a | b
|
|
---+------------------------
|
|
1 | "aa"=>"bb", "cc"=>NULL
|
|
(1 row)
|
|
|
|
CREATE FUNCTION test4() RETURNS trigger
|
|
LANGUAGE plperlu
|
|
TRANSFORM FOR TYPE hstore
|
|
AS $$
|
|
use Data::Dumper;
|
|
$Data::Dumper::Sortkeys = 1;
|
|
elog(INFO, Dumper($_TD->{new}));
|
|
if ($_TD->{new}{a} == 1) {
|
|
$_TD->{new}{b} = {a => 1, b => 'boo', c => undef};
|
|
}
|
|
|
|
return "MODIFY";
|
|
$$;
|
|
CREATE TRIGGER test4 BEFORE UPDATE ON test1 FOR EACH ROW EXECUTE PROCEDURE test4();
|
|
UPDATE test1 SET a = a;
|
|
INFO: $VAR1 = {
|
|
'a' => '1',
|
|
'b' => {
|
|
'aa' => 'bb',
|
|
'cc' => undef
|
|
}
|
|
};
|
|
|
|
SELECT * FROM test1;
|
|
a | b
|
|
---+---------------------------------
|
|
1 | "a"=>"1", "b"=>"boo", "c"=>NULL
|
|
(1 row)
|
|
|
|
DROP TABLE test1;
|
|
DROP FUNCTION test1(hstore);
|
|
DROP FUNCTION test1none(hstore);
|
|
DROP FUNCTION test1list(hstore);
|
|
DROP FUNCTION test1arr(hstore[]);
|
|
DROP FUNCTION test3();
|
|
DROP FUNCTION test4();
|
|
DROP EXTENSION hstore_plperlu;
|
|
DROP EXTENSION hstore;
|
|
DROP EXTENSION plperlu;
|