OCM-1524: adding table to n:1 cascade merge should work as with merge-leaf scenario

2 files changed, 4 insertions, 3 deletions

diff --git a/sql/londiste/functions/londiste.get_table_list.sql b/sql/londiste/functions/londiste.get_table_list.sql
index 80e49bc4..8d3f7b7f 100644
--- a/sql/londiste/functions/londiste.get_table_list.sql
+++ b/sql/londiste/functions/londiste.get_table_list.sql
@@ -49,7 +49,8 @@ begin
                count(nullif(t2.merge_state, 'in-copy')) as _done
             from londiste.table_info t
             join pgq_node.node_info n on (n.queue_name = t.queue_name)
-            left join pgq_node.node_info n2 on (n2.combined_queue = n.combined_queue)
+            left join pgq_node.node_info n2 on (n2.combined_queue = n.combined_queue or
+                (n2.combined_queue is null and n.combined_queue is null))
             left join londiste.table_info t2 on (t2.table_name = t.table_name and t2.queue_name = n2.queue_name)
             where t.queue_name = i_queue_name
             group by t.nr, t.table_name, t.local, t.merge_state, t.custom_snapshot, t.table_attrs, t.dropped_ddl
diff --git a/tests/merge/regen.sh b/tests/merge/regen.sh
index c9c38831..0ec1d7ac 100755
--- a/tests/merge/regen.sh
+++ b/tests/merge/regen.sh
@@ -155,13 +155,13 @@ done
 
 msg "Create table and register it in full nodes"
 for db in full2; do
-  run londiste3 $v conf/londiste_$db.ini add-table mydata --create-only=pkey
+  run londiste3 $v conf/londiste_$db.ini add-table mydata --create
   for src in $part_list; do
     run londiste3 $v conf/londiste_${src}_${db}.ini add-table mydata
   done
 done
 for db in full3 full4; do
-  run londiste3 $v conf/londiste_$db.ini add-table mydata --create-only=pkey
+  run londiste3 $v conf/londiste_$db.ini add-table mydata --create
 done
 
 msg "Sleep a bit"