3 files changed, 9 insertions, 25 deletions
diff --git a/sql/londiste/expected/londiste_fkeys.out b/sql/londiste/expected/londiste_fkeys.out
index 76b8b3b7..210f9d19 100644
--- a/sql/londiste/expected/londiste_fkeys.out
+++ b/sql/londiste/expected/londiste_fkeys.out
@@ -1,3 +1,4 @@
+set log_error_verbosity = 'terse';
 create table ref_1 (
     id int4 primary key,
     val text
diff --git a/sql/londiste/expected/londiste_provider.out b/sql/londiste/expected/londiste_provider.out
index 24533352..3ff2a201 100644
--- a/sql/londiste/expected/londiste_provider.out
+++ b/sql/londiste/expected/londiste_provider.out
@@ -1,4 +1,5 @@
 set client_min_messages = 'warning';
+\set VERBOSITY 'terse'
 --
 -- tables
 --
@@ -12,10 +13,8 @@ create table testdata_nopk (
 );
 select londiste.provider_add_table('pqueue', 'public.testdata_nopk');
 ERROR:  need key column
-CONTEXT:  PL/pgSQL function "provider_add_table" line 2 at RETURN
 select londiste.provider_add_table('pqueue', 'public.testdata');
 ERROR:  no such event queue
-CONTEXT:  PL/pgSQL function "provider_add_table" line 2 at RETURN
 select pgq.create_queue('pqueue');
  create_queue 
 --------------
@@ -29,10 +28,7 @@ select londiste.provider_add_table('pqueue', 'public.testdata');
 (1 row)
 
 select londiste.provider_add_table('pqueue', 'public.testdata');
-ERROR:  duplicate key value violates unique constraint "provider_table_pkey"
-CONTEXT:  SQL statement "INSERT INTO londiste.provider_table (queue_name, table_name, trigger_name) values ( $1 ,  $2 ,  $3 )"
-PL/pgSQL function "provider_add_table" line 23 at SQL statement
-PL/pgSQL function "provider_add_table" line 2 at RETURN
+ERROR:  duplicate key violates unique constraint "provider_table_pkey"
 select londiste.provider_refresh_trigger('pqueue', 'public.testdata');
  provider_refresh_trigger 
 --------------------------
@@ -68,9 +64,6 @@ select * from londiste.provider_get_seq_list('pqueue');
 
 select londiste.provider_add_seq('pqueue', 'public.no_seq');
 ERROR:  seq not found
-CONTEXT:  PL/pgSQL function "find_seq_oid" line 2 at RETURN
-SQL statement "SELECT  1 from pg_class where oid = londiste.find_seq_oid( $1 )"
-PL/pgSQL function "provider_add_seq" line 10 at PERFORM
 select londiste.provider_add_seq('pqueue', 'public.testdata_id_seq');
  provider_add_seq 
 ------------------
@@ -78,9 +71,7 @@ select londiste.provider_add_seq('pqueue', 'public.testdata_id_seq');
 (1 row)
 
 select londiste.provider_add_seq('pqueue', 'public.testdata_id_seq');
-ERROR:  duplicate key value violates unique constraint "provider_seq_pkey"
-CONTEXT:  SQL statement "INSERT INTO londiste.provider_seq (queue_name, seq_name) values ( $1 ,  $2 )"
-PL/pgSQL function "provider_add_seq" line 16 at SQL statement
+ERROR:  duplicate key violates unique constraint "provider_seq_pkey"
 select * from londiste.provider_get_seq_list('pqueue');
  provider_get_seq_list  
 ------------------------
@@ -112,7 +103,6 @@ select londiste.provider_add_table('pqueue', 'public.testdata');
 insert into londiste.link (source, dest) values ('mqueue', 'pqueue');
 select londiste.provider_add_table('pqueue', 'public.testdata');
 ERROR:  Linked queue, manipulation not allowed
-CONTEXT:  PL/pgSQL function "provider_add_table" line 2 at RETURN
 select londiste.provider_remove_table('pqueue', 'public.testdata');
 ERROR:  Linked queue, manipulation not allowed
 select londiste.provider_add_seq('pqueue', 'public.testdata_id_seq');
diff --git a/sql/londiste/expected/londiste_subscriber.out b/sql/londiste/expected/londiste_subscriber.out
index a5dffac8..ed67d612 100644
--- a/sql/londiste/expected/londiste_subscriber.out
+++ b/sql/londiste/expected/londiste_subscriber.out
@@ -1,4 +1,5 @@
 set client_min_messages = 'warning';
+\set VERBOSITY 'terse'
 create table testdata (
     id serial primary key,
     data text
@@ -25,13 +26,9 @@ select pgq.create_queue('pqueue');
 (1 row)
 
 select londiste.subscriber_add_table('pqueue', 'public.testdata');
-ERROR:  duplicate key value violates unique constraint "subscriber_table_pkey"
-CONTEXT:  SQL statement "INSERT INTO londiste.subscriber_table (queue_name, table_name) values ( $1 ,  $2 )"
-PL/pgSQL function "subscriber_add_table" line 2 at SQL statement
+ERROR:  duplicate key violates unique constraint "subscriber_table_pkey"
 select londiste.subscriber_add_table('pqueue', 'public.testdata');
-ERROR:  duplicate key value violates unique constraint "subscriber_table_pkey"
-CONTEXT:  SQL statement "INSERT INTO londiste.subscriber_table (queue_name, table_name) values ( $1 ,  $2 )"
-PL/pgSQL function "subscriber_add_table" line 2 at SQL statement
+ERROR:  duplicate key violates unique constraint "subscriber_table_pkey"
 select * from londiste.subscriber_get_table_list('pqueue');
       table_name      | merge_state | snapshot | trigger_name | skip_truncate 
 ----------------------+-------------+----------+--------------+---------------
@@ -74,9 +71,7 @@ select londiste.subscriber_add_seq('pqueue', 'public.testdata_id_seq');
 (1 row)
 
 select londiste.subscriber_add_seq('pqueue', 'public.testdata_id_seq');
-ERROR:  duplicate key value violates unique constraint "subscriber_seq_pkey"
-CONTEXT:  SQL statement "INSERT INTO londiste.subscriber_seq (queue_name, seq_name) values ( $1 ,  $2 )"
-PL/pgSQL function "subscriber_add_seq" line 4 at SQL statement
+ERROR:  duplicate key violates unique constraint "subscriber_seq_pkey"
 select * from londiste.subscriber_get_seq_list('pqueue');
  subscriber_get_seq_list 
 -------------------------
@@ -109,9 +104,7 @@ select londiste.subscriber_add_table('pqueue', 'public.testdata');
 
 insert into londiste.link (source, dest) values ('mqueue', 'pqueue');
 select londiste.subscriber_add_table('pqueue', 'public.testdata');
-ERROR:  duplicate key value violates unique constraint "subscriber_table_pkey"
-CONTEXT:  SQL statement "INSERT INTO londiste.subscriber_table (queue_name, table_name) values ( $1 ,  $2 )"
-PL/pgSQL function "subscriber_add_table" line 2 at SQL statement
+ERROR:  duplicate key violates unique constraint "subscriber_table_pkey"
 select londiste.subscriber_remove_table('pqueue', 'public.testdata');
  subscriber_remove_table 
 -------------------------