sql/pgq: use terse verbosity in regtests

diff --git a/sql/pgq/expected/logutriga.out b/sql/pgq/expected/logutriga.out
index d6a5aaf4a56b21b9a4a45b75275b3678261752d2..c0017c4df6fe077b248ecdbdcc714548d4d3d915 100644 (file)
--- a/sql/pgq/expected/logutriga.out
+++ b/sql/pgq/expected/logutriga.out
@@ -1,3 +1,4 @@
+\set VERBOSITY 'terse'
 select 1 from (select set_config(name, 'escape', false) as ignore
           from pg_settings where name = 'bytea_output') x
           where x.ignore = 'foo';
@@ -24,10 +25,8 @@ create trigger utest AFTER insert or update or delete ON udata
 for each row execute procedure pgq.logutriga('udata_que');
 insert into udata (txt) values ('text1');
 NOTICE:  insert_event(udata_que, I:id, id=1&txt=text1&bin, public.udata)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 insert into udata (bin) values (E'bi\tn\\000bin');
 NOTICE:  insert_event(udata_que, I:id, id=2&txt&bin=bi%5c011n%5c000bin, public.udata)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 -- test ignore
 drop trigger utest on udata;
 truncate udata;
@@ -35,24 +34,19 @@ create trigger utest after insert or update or delete on udata
 for each row execute procedure pgq.logutriga('udata_que', 'ignore=bin');
 insert into udata values (1, 'txt', 'bin');
 NOTICE:  insert_event(udata_que, I:id, id=1&txt=txt, public.udata)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 update udata set txt = 'txt';
 NOTICE:  insert_event(udata_que, U:id, id=1&txt=txt, public.udata)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 update udata set txt = 'txt2', bin = 'bin2';
 NOTICE:  insert_event(udata_que, U:id, id=1&txt=txt2, public.udata)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 update udata set bin = 'bin3';
 delete from udata;
 NOTICE:  insert_event(udata_que, D:id, id=1&txt=txt2, public.udata)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 -- test missing pkey
 create table nopkey2 (dat text);
 create trigger nopkey_triga2 after insert or update or delete on nopkey2
 for each row execute procedure pgq.logutriga('que3');
 insert into nopkey2 values ('foo');
 NOTICE:  insert_event(que3, I:, dat=foo, public.nopkey2)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 update nopkey2 set dat = 'bat';
 ERROR:  Update/Delete on table without pkey
 delete from nopkey2;
@@ -64,7 +58,6 @@ create trigger ucustom_triga after insert or update or delete on ucustom_pkey
 for each row execute procedure pgq.logutriga('que3');
 insert into ucustom_pkey values ('foo', '2');
 NOTICE:  insert_event(que3, I:, dat1=foo&dat2=2&dat3, public.ucustom_pkey)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 update ucustom_pkey set dat3 = 'bat';
 ERROR:  Update/Delete on table without pkey
 delete from ucustom_pkey;
@@ -85,13 +78,10 @@ create trigger customf2_triga after insert or update or delete on custom_fields2
 for each row execute procedure pgq.logutriga('que3');
 insert into custom_fields2 values ('foo', '2');
 NOTICE:  insert_event(que3, my_type, dat1=foo&dat2=2&dat3, e1)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 update custom_fields2 set dat3 = 'bat';
 NOTICE:  insert_event(que3, my_type, dat1=foo&dat2=2&dat3=bat, e1)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 delete from custom_fields2;
 NOTICE:  insert_event(que3, my_type, dat1=foo&dat2=2&dat3=bat, e1)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 -- test custom expression
 create table custom_expr2 (
     dat1 text not null primary key,
@@ -103,13 +93,10 @@ create trigger customex2_triga after insert or update or delete on custom_expr2
 for each row execute procedure pgq.logutriga('que3', 'ev_extra1=''test='' || dat1', 'ev_type=dat3');
 insert into custom_expr2 values ('foo', '2');
 NOTICE:  insert_event(que3, <NULL>, dat1=foo&dat2=2&dat3, test=foo)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 update custom_expr2 set dat3 = 'bat';
 NOTICE:  insert_event(que3, bat, dat1=foo&dat2=2&dat3=bat, test=foo)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 delete from custom_expr2;
 NOTICE:  insert_event(que3, bat, dat1=foo&dat2=2&dat3=bat, test=foo)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 -- test when=
 create table when_test (
     dat1 text not null primary key,
@@ -121,7 +108,6 @@ create trigger when_triga after insert or update or delete on when_test
 for each row execute procedure pgq.logutriga('que3', 'when=dat1=''foo''');
 insert into when_test values ('foo', '2');
 NOTICE:  insert_event(que3, I:dat1, dat1=foo&dat2=2&dat3, public.when_test)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 insert into when_test values ('bar', '2');
 select * from when_test;
  dat1 | dat2 | dat3 
@@ -132,10 +118,8 @@ select * from when_test;
 
 update when_test set dat3 = 'bat';
 NOTICE:  insert_event(que3, U:dat1, dat1=foo&dat2=2&dat3=bat, public.when_test)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 delete from when_test;
 NOTICE:  insert_event(que3, D:dat1, dat1=foo&dat2=2&dat3=bat, public.when_test)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 drop trigger when_triga on when_test;
 create trigger when_triga after insert or update or delete on when_test
 for each row execute procedure pgq.logutriga('que3', 'when=current_user=''random''');
@@ -159,6 +143,5 @@ ERROR:  Table 'public.deny_test' to queue 'noqueue': change not allowed (I)
 -- test pk update
 insert into udata (id, txt) values (1, 'txt');
 NOTICE:  insert_event(udata_que, I:id, id=1&txt=txt, public.udata)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 update udata set id = 2;
 ERROR:  primary key update not allowed

diff --git a/sql/pgq/expected/pgq_core.out b/sql/pgq/expected/pgq_core.out
index a0c760fae272d79f79fd446e9c697c160a6ac0f0..265ccc412e41ed3fadbd26b4a98279c8e89fd6d9 100644 (file)
--- a/sql/pgq/expected/pgq_core.out
+++ b/sql/pgq/expected/pgq_core.out
@@ -1,3 +1,4 @@
+\set VERBOSITY 'terse'
 select * from pgq.maint_tables_to_vacuum();
  maint_tables_to_vacuum 
 ------------------------
@@ -340,8 +341,6 @@ select pgq.insert_event('myqueue', 'test', 'event');
 update pgq.queue set queue_disable_insert = true where queue_name = 'myqueue';
 select pgq.insert_event('myqueue', 'test', 'event');
 ERROR:  Insert into queue disallowed
-CONTEXT:  PL/pgSQL function "insert_event" line 19 at RETURN
-PL/pgSQL function "insert_event" line 15 at RETURN
 update pgq.queue set queue_disable_insert = false where queue_name = 'myqueue';
 select pgq.insert_event('myqueue', 'test', 'event');
  insert_event 
@@ -366,15 +365,11 @@ select pgq.insert_event('myqueue', 'test', 'event2');
 
 select pgq.insert_event('myqueue', 'test', 'event3');
 ERROR:  Queue 'myqueue' allows max 2 events from one TX
-CONTEXT:  PL/pgSQL function "insert_event" line 19 at RETURN
-PL/pgSQL function "insert_event" line 15 at RETURN
 end;
 update pgq.queue set queue_per_tx_limit = 0 where queue_name = 'myqueue';
 begin;
 select pgq.insert_event('myqueue', 'test', 'event1');
 ERROR:  Queue 'myqueue' allows max 0 events from one TX
-CONTEXT:  PL/pgSQL function "insert_event" line 19 at RETURN
-PL/pgSQL function "insert_event" line 15 at RETURN
 select pgq.insert_event('myqueue', 'test', 'event2');
 ERROR:  current transaction is aborted, commands ignored until end of transaction block
 select pgq.insert_event('myqueue', 'test', 'event3');

diff --git a/sql/pgq/expected/sqltriga.out b/sql/pgq/expected/sqltriga.out
index b1ccafaf77a89c3ba9da0ce54d23b4e9d5d19958..139de0818af259332cc31bc2b5a3f951c0771934 100644 (file)
--- a/sql/pgq/expected/sqltriga.out
+++ b/sql/pgq/expected/sqltriga.out
@@ -1,3 +1,4 @@
+\set VERBOSITY 'terse'
 -- start testing
 create table rtest (
        id integer primary key,
@@ -9,40 +10,30 @@ for each row execute procedure pgq.sqltriga('que');
 -- simple test
 insert into rtest values (1, 'value1');
 NOTICE:  insert_event(que, I, (id,dat) values ('1','value1'), public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 update rtest set dat = 'value2';
 NOTICE:  insert_event(que, U, dat='value2' where id='1', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 delete from rtest;
 NOTICE:  insert_event(que, D, id='1', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 -- test new fields
 alter table rtest add column dat2 text;
 insert into rtest values (1, 'value1');
 NOTICE:  insert_event(que, I, (id,dat,dat2) values ('1','value1',null), public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 update rtest set dat = 'value2';
 NOTICE:  insert_event(que, U, dat='value2' where id='1', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 delete from rtest;
 NOTICE:  insert_event(que, D, id='1', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 -- test field ignore
 drop trigger rtest_triga on rtest;
 create trigger rtest_triga after insert or update or delete on rtest
 for each row execute procedure pgq.sqltriga('que2', 'ignore=dat2');
 insert into rtest values (1, '666', 'newdat');
 NOTICE:  insert_event(que2, I, (id,dat) values ('1','666'), public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 update rtest set dat = 5, dat2 = 'newdat2';
 NOTICE:  insert_event(que2, U, dat='5' where id='1', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 update rtest set dat = 6;
 NOTICE:  insert_event(que2, U, dat='6' where id='1', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 delete from rtest;
 NOTICE:  insert_event(que2, D, id='1', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 -- test hashed pkey
 -- drop trigger rtest_triga on rtest;
 -- create trigger rtest_triga after insert or update or delete on rtest
@@ -57,32 +48,24 @@ create trigger rtest_triga after insert or update or delete on rtest
 for each row execute procedure pgq.sqltriga('que3');
 insert into rtest values (1, 0, 'non-null');
 NOTICE:  insert_event(que3, I, (id,dat,dat2) values ('1','0','non-null'), public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 insert into rtest values (2, 0, NULL);
 NOTICE:  insert_event(que3, I, (id,dat,dat2) values ('2','0',null), public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 update rtest set dat2 = 'non-null2' where id=1;
 NOTICE:  insert_event(que3, U, dat2='non-null2' where id='1', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 update rtest set dat2 = NULL where id=1;
 NOTICE:  insert_event(que3, U, dat2=NULL where id='1', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 update rtest set dat2 = 'new-nonnull' where id=2;
 NOTICE:  insert_event(que3, U, dat2='new-nonnull' where id='2', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 delete from rtest where id=1;
 NOTICE:  insert_event(que3, D, id='1', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 delete from rtest where id=2;
 NOTICE:  insert_event(que3, D, id='2', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 -- test missing pkey
 create table nopkey (dat text);
 create trigger nopkey_triga after insert or update or delete on nopkey
 for each row execute procedure pgq.sqltriga('que3');
 insert into nopkey values ('foo');
 NOTICE:  insert_event(que3, I, (dat) values ('foo'), public.nopkey)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 update nopkey set dat = 'bat';
 ERROR:  Update/Delete on table without pkey
 delete from nopkey;
@@ -93,13 +76,10 @@ create trigger custom_triga after insert or update or delete on custom_pkey
 for each row execute procedure pgq.sqltriga('que3', 'pkey=dat1,dat2');
 insert into custom_pkey values ('foo', '2');
 NOTICE:  insert_event(que3, I, (dat1,dat2,dat3) values ('foo','2',null), public.custom_pkey)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 update custom_pkey set dat3 = 'bat';
 NOTICE:  insert_event(que3, U, dat3='bat' where dat1='foo' and dat2='2', public.custom_pkey)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 delete from custom_pkey;
 NOTICE:  insert_event(que3, D, dat1='foo' and dat2='2', public.custom_pkey)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 -- test custom fields
 create table custom_fields (
     dat1 text not null primary key,
@@ -116,13 +96,10 @@ create trigger customf_triga after insert or update or delete on custom_fields
 for each row execute procedure pgq.sqltriga('que3');
 insert into custom_fields values ('foo', '2');
 NOTICE:  insert_event(que3, my_type, (dat1,dat2,dat3) values ('foo','2',null), e1)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 update custom_fields set dat3 = 'bat';
 NOTICE:  insert_event(que3, my_type, dat3='bat' where dat1='foo', e1)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 delete from custom_fields;
 NOTICE:  insert_event(que3, my_type, dat1='foo', e1)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 -- test custom expression
 create table custom_expr (
     dat1 text not null primary key,
@@ -134,16 +111,12 @@ create trigger customex_triga after insert or update or delete on custom_expr
 for each row execute procedure pgq.sqltriga('que3', 'ev_extra1=''test='' || dat1', 'ev_type=dat3');
 insert into custom_expr values ('foo', '2');
 NOTICE:  insert_event(que3, <NULL>, (dat1,dat2,dat3) values ('foo','2',null), test=foo)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 update custom_expr set dat3 = 'bat';
 NOTICE:  insert_event(que3, bat, dat3='bat' where dat1='foo', test=foo)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 delete from custom_expr;
 NOTICE:  insert_event(que3, bat, dat1='foo', test=foo)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 -- test pk update
 insert into rtest values (1, 'value1');
 NOTICE:  insert_event(que3, I, (id,dat,dat2) values ('1','value1',null), public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 update rtest set id = 2;
 ERROR:  primary key update not allowed

diff --git a/sql/pgq/expected/trunctrg.out b/sql/pgq/expected/trunctrg.out
index 8563565dc79a3ab8d78ac2cae74e42715273be27..2aba1302b5bda1fbee2cb0b98e2e10a5b2c925a6 100644 (file)
--- a/sql/pgq/expected/trunctrg.out
+++ b/sql/pgq/expected/trunctrg.out
@@ -1,3 +1,4 @@
+\set VERBOSITY 'terse'
 -- test sqltriga truncate
 create table trunctrg1 (
     dat1 text not null primary key,
@@ -9,7 +10,6 @@ create trigger trunc1_trig after truncate on trunctrg1
 for each statement execute procedure pgq.sqltriga('que3');
 truncate trunctrg1;
 NOTICE:  insert_event(que3, R, , public.trunctrg1)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 -- test logutriga truncate
 create table trunctrg2 (
     dat1 text not null primary key,
@@ -21,7 +21,6 @@ create trigger trunc2_trig after truncate on trunctrg2
 for each statement execute procedure pgq.logutriga('que3');
 truncate trunctrg2;
 NOTICE:  insert_event(que3, R, , public.trunctrg2)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, $6, $7)"
 -- test deny
 create trigger deny_triga2 after truncate on trunctrg2
 for each statement execute procedure pgq.logutriga('noqueue', 'deny');

diff --git a/sql/pgq/sql/logutriga.sql b/sql/pgq/sql/logutriga.sql
index cd5ce151c4b8d06249b0743302c005055d70ba63..5f8e7aa0ce83fa6687a1a81489e72e61b32a5a21 100644 (file)
--- a/sql/pgq/sql/logutriga.sql
+++ b/sql/pgq/sql/logutriga.sql
@@ -1,3 +1,4 @@
+\set VERBOSITY 'terse'
 
 select 1 from (select set_config(name, 'escape', false) as ignore
           from pg_settings where name = 'bytea_output') x

diff --git a/sql/pgq/sql/pgq_core.sql b/sql/pgq/sql/pgq_core.sql
index 66cdb56e58cd11139113453318eb2c56d9d9d354..b312f1219c27f8685ba2164559487acaabd59d93 100644 (file)
--- a/sql/pgq/sql/pgq_core.sql
+++ b/sql/pgq/sql/pgq_core.sql
@@ -1,3 +1,4 @@
+\set VERBOSITY 'terse'
 
 select * from pgq.maint_tables_to_vacuum();
 select * from pgq.maint_retry_events();

diff --git a/sql/pgq/sql/pgq_init.sql b/sql/pgq/sql/pgq_init.sql
index 18a6344bbed6d896201e3e747e837643809eead4..d33cd9c70d05e966ecc6d6210c597564b6f695ec 100644 (file)
--- a/sql/pgq/sql/pgq_init.sql
+++ b/sql/pgq/sql/pgq_init.sql
@@ -1,5 +1,7 @@
 
 \set ECHO none
+\set VERBOSITY 'terse'
+
 -- \i ../txid/txid.sql
 -- \i pgq.sql
 \i structure/install.sql

diff --git a/sql/pgq/sql/sqltriga.sql b/sql/pgq/sql/sqltriga.sql
index 2d0d0192c63de0e26057949e6f6133edb0b117dd..f858f9115c1e444f2dd1c771176fafdf7776899d 100644 (file)
--- a/sql/pgq/sql/sqltriga.sql
+++ b/sql/pgq/sql/sqltriga.sql
@@ -1,3 +1,4 @@
+\set VERBOSITY 'terse'
 
 -- start testing
 create table rtest (

diff --git a/sql/pgq/sql/trunctrg.sql b/sql/pgq/sql/trunctrg.sql
index 53ef8d7056d89ad02dc183cf907b5909b88ab64e..f999dedc8c23acf55d34f41e7c719470b0d15ec3 100644 (file)
--- a/sql/pgq/sql/trunctrg.sql
+++ b/sql/pgq/sql/trunctrg.sql
@@ -1,3 +1,4 @@
+\set VERBOSITY 'terse'
 
 -- test sqltriga truncate
 create table trunctrg1 (