couple of places were not updated for skip-truncate

diff --git a/sql/londiste/expected/londiste_subscriber.out b/sql/londiste/expected/londiste_subscriber.out
index fb2846436f209a6182b0f13f7fc71205e35e6456..5b9501c36805af2ec5300e91b9c32a5c6421b39d 100644 (file)
--- a/sql/londiste/expected/londiste_subscriber.out
+++ b/sql/londiste/expected/londiste_subscriber.out
@@ -33,10 +33,10 @@ ERROR:  duplicate key 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
 select * from londiste.subscriber_get_table_list('pqueue');
-      table_name      | merge_state | snapshot | trigger_name 
-----------------------+-------------+----------+--------------
- public.testdata_nopk |             |          | 
- public.testdata      |             |          | 
+      table_name      | merge_state | snapshot | trigger_name | skip_truncate 
+----------------------+-------------+----------+--------------+---------------
+ public.testdata_nopk |             |          |              | 
+ public.testdata      |             |          |              | 
 (2 rows)
 
 select londiste.subscriber_remove_table('pqueue', 'public.nonexist');
@@ -48,9 +48,9 @@ select londiste.subscriber_remove_table('pqueue', 'public.testdata');
 (1 row)
 
 select * from londiste.subscriber_get_table_list('pqueue');
-      table_name      | merge_state | snapshot | trigger_name 
-----------------------+-------------+----------+--------------
- public.testdata_nopk |             |          | 
+      table_name      | merge_state | snapshot | trigger_name | skip_truncate 
+----------------------+-------------+----------+--------------+---------------
+ public.testdata_nopk |             |          |              | 
 (1 row)
 
 --

diff --git a/sql/londiste/functions/londiste.subscriber_get_table_list.sql b/sql/londiste/functions/londiste.subscriber_get_table_list.sql
index 4a17d5da42934c9f4e0c58097dcf3ba869e9ad71..06f79e839f4a2cd51662271b2f3c27a0a05709ee 100644 (file)
--- a/sql/londiste/functions/londiste.subscriber_get_table_list.sql
+++ b/sql/londiste/functions/londiste.subscriber_get_table_list.sql
@@ -5,7 +5,7 @@ declare
     rec londiste.ret_subscriber_table%rowtype;
 begin
     for rec in
-        select table_name, merge_state, snapshot, trigger_name
+        select table_name, merge_state, snapshot, trigger_name, skip_truncate
           from londiste.subscriber_table
          where queue_name = i_queue_name
          order by nr

diff --git a/sql/londiste/structure/tables.sql b/sql/londiste/structure/tables.sql
index 226eafd987cb2d6650d6068666b642e7e7ecf64c..b21b8ff18d10a0ea2aed6f68cb0abc6fd0c73cde 100644 (file)
--- a/sql/londiste/structure/tables.sql
+++ b/sql/londiste/structure/tables.sql
@@ -26,8 +26,8 @@ create table londiste.completed (
 );
 
 create table londiste.link (
-    source text not null,
-    dest text not null,
+    source    text not null,
+    dest      text not null,
     primary key (source),
     unique (dest)
 );
@@ -48,7 +48,7 @@ create table londiste.subscriber_table (
 create table londiste.subscriber_seq (
     nr                  serial not null,
     queue_name          text not null,
-    seq_name          text not null,
+    seq_name            text not null,
 
     primary key (queue_name, seq_name)
 );

diff --git a/sql/londiste/structure/types.sql b/sql/londiste/structure/types.sql
index e5d6465523a57c8f6542abc258610d755c911db6..1a655eb6ecac6e141edb5f64906b3110b4bf1cbd 100644 (file)
--- a/sql/londiste/structure/types.sql
+++ b/sql/londiste/structure/types.sql
@@ -8,6 +8,7 @@ create type londiste.ret_subscriber_table as (
     table_name text,
     merge_state text,
     snapshot text,
-    trigger_name text
+    trigger_name text,
+    skip_truncate bool
 );