londiste: regtest: avoid 'data', seems its dirty word now

diff --git a/sql/londiste/expected/londiste_provider.out b/sql/londiste/expected/londiste_provider.out
index 840d650af288d5a1c344fe7e55a78d59d3d506a3..508b0ddb7ef341bf9362497d168671d474cfd5b3 100644 (file)
--- a/sql/londiste/expected/londiste_provider.out
+++ b/sql/londiste/expected/londiste_provider.out
@@ -5,11 +5,11 @@ set client_min_messages = 'warning';
 --
 create table testdata (
     id serial primary key,
-    data text
+    txt text
 );
 create table testdata_nopk (
     id serial,
-    data text
+    txt text
 );
 select current_database();
  current_database 
@@ -41,7 +41,7 @@ select * from londiste.local_add_table('aset', 'public.testdata');
       200 | Table added: public.testdata
 (1 row)
 
-insert into testdata (data) values ('test-data');
+insert into testdata (txt) values ('test-data');
 select * from londiste.get_table_list('aset');
    table_name    | local | merge_state | custom_snapshot | table_attrs | dropped_ddl | copy_role 
 -----------------+-------+-------------+-----------------+-------------+-------------+-----------
@@ -74,11 +74,11 @@ select * from londiste.get_table_list('aset');
 (0 rows)
 
 select ev_id, ev_type, ev_data, ev_extra1 from pgq.event_template;
- ev_id |        ev_type        |              ev_data               |    ev_extra1    
--------+-----------------------+------------------------------------+-----------------
-     1 | londiste.add-table    | public.testdata                    | 
-     2 | I                     | (id,data) values ('1','test-data') | public.testdata
-     3 | londiste.remove-table | public.testdata                    | 
+ ev_id |        ev_type        |              ev_data              |    ev_extra1    
+-------+-----------------------+-----------------------------------+-----------------
+     1 | londiste.add-table    | public.testdata                   | 
+     2 | I                     | (id,txt) values ('1','test-data') | public.testdata
+     3 | londiste.remove-table | public.testdata                   | 
 (3 rows)
 
 select * from londiste.local_show_missing('aset');

diff --git a/sql/londiste/expected/londiste_seqs.out b/sql/londiste/expected/londiste_seqs.out
index 365cde2f992bfcac211631856d0db32b1e1858af..459f7d939749993c70f0accc7d878760d42e5458 100644 (file)
--- a/sql/londiste/expected/londiste_seqs.out
+++ b/sql/londiste/expected/londiste_seqs.out
@@ -52,17 +52,12 @@ select * from londiste.get_seq_list('seqroot');
 ----------+------------+-------
 (0 rows)
 
-select ev_id, ev_type, ev_data, ev_extra1 from pgq.event_template;
- ev_id |        ev_type        |              ev_data               |    ev_extra1     
--------+-----------------------+------------------------------------+------------------
-     1 | londiste.add-table    | public.testdata                    | 
-     2 | I                     | (id,data) values ('1','test-data') | public.testdata
-     3 | londiste.remove-table | public.testdata                    | 
-     4 | EXECUTE               | drop all                           | DDL-root.sql
-     5 | EXECUTE               | drop all                           | DDL-root.sql
-     1 | londiste.update-seq   | 30001                              | public.masterseq
-     2 | londiste.remove-seq   | public.masterseq                   | 
-(7 rows)
+select ev_id, ev_type, ev_data, ev_extra1 from pgq.event_template where ev_type like '%seq%';
+ ev_id |       ev_type       |     ev_data      |    ev_extra1     
+-------+---------------------+------------------+------------------
+     1 | londiste.update-seq | 30001            | public.masterseq
+     2 | londiste.remove-seq | public.masterseq | 
+(2 rows)
 
 -- subscriber
 select * from pgq_node.register_location('seqbranch', 'subnode', 'dbname=db', false);

diff --git a/sql/londiste/sql/londiste_provider.sql b/sql/londiste/sql/londiste_provider.sql
index d324b887bd1f9b54d8b7704d0e017b82e3611dae..b39e1c75b9fae8e5c45210f9850a86c77b695b7c 100644 (file)
--- a/sql/londiste/sql/londiste_provider.sql
+++ b/sql/londiste/sql/londiste_provider.sql
@@ -7,11 +7,11 @@ set client_min_messages = 'warning';
 --
 create table testdata (
     id serial primary key,
-    data text
+    txt text
 );
 create table testdata_nopk (
     id serial,
-    data text
+    txt text
 );
 
 select current_database();
@@ -21,7 +21,7 @@ select * from pgq_node.create_node('aset', 'root', 'rnode', 'londiste_root', nul
 
 select * from londiste.local_add_table('aset', 'public.testdata_nopk');
 select * from londiste.local_add_table('aset', 'public.testdata');
-insert into testdata (data) values ('test-data');
+insert into testdata (txt) values ('test-data');
 select * from londiste.get_table_list('aset');
 select * from londiste.local_show_missing('aset');
 select * from londiste.local_remove_table('aset', 'public.testdata');

diff --git a/sql/londiste/sql/londiste_seqs.sql b/sql/londiste/sql/londiste_seqs.sql
index e0038a56fe3cfeb6717db56cd473fc352daa2fbf..27f3cd50c266005972bb6ec430b386bb721ba106 100644 (file)
--- a/sql/londiste/sql/londiste_seqs.sql
+++ b/sql/londiste/sql/londiste_seqs.sql
@@ -21,7 +21,7 @@ select * from londiste.local_remove_seq('seqroot', 'masterseq');
 
 select * from londiste.get_seq_list('seqroot');
 
-select ev_id, ev_type, ev_data, ev_extra1 from pgq.event_template;
+select ev_id, ev_type, ev_data, ev_extra1 from pgq.event_template where ev_type like '%seq%';
 
 -- subscriber
 select * from pgq_node.register_location('seqbranch', 'subnode', 'dbname=db', false);