6 files changed, 14 insertions, 12 deletions
diff --git a/sql/londiste/Makefile b/sql/londiste/Makefile
index e89b0dc4..532ff4e9 100644
--- a/sql/londiste/Makefile
+++ b/sql/londiste/Makefile
@@ -1,8 +1,8 @@
 
 EXTENSION = londiste
 
-EXT_VERSION = 3.2.3
-EXT_OLD_VERSIONS = 3.1 3.1.1 3.1.3 3.1.4 3.1.6 3.2
+EXT_VERSION = 3.2.4
+EXT_OLD_VERSIONS = 3.1 3.1.1 3.1.3 3.1.4 3.1.6 3.2 3.2.3
 
 base_regress = londiste_provider londiste_subscriber \
 	       londiste_fkeys londiste_execute londiste_seqs londiste_merge \
diff --git a/sql/londiste/functions/londiste.version.sql b/sql/londiste/functions/londiste.version.sql
index 01cedf5a..c180973d 100644
--- a/sql/londiste/functions/londiste.version.sql
+++ b/sql/londiste/functions/londiste.version.sql
@@ -8,7 +8,7 @@ returns text as $$
 --      version and only bumped when database code changes.
 -- ----------------------------------------------------------------------
 begin
-    return '3.2.3';
+    return '3.2.4';
 end;
 $$ language plpgsql;
 
diff --git a/sql/londiste/londiste.control b/sql/londiste/londiste.control
index a23e5dd9..3dc5c735 100644
--- a/sql/londiste/londiste.control
+++ b/sql/londiste/londiste.control
@@ -1,6 +1,6 @@
 # Londiste extensions
 comment = 'Londiste Replication'
-default_version = '3.2.3'
+default_version = '3.2.4'
 relocatable = false
 superuser = true
 schema = 'pg_catalog'
diff --git a/sql/londiste/structure/functions.sql b/sql/londiste/structure/functions.sql
index 5936536b..4b00feee 100644
--- a/sql/londiste/structure/functions.sql
+++ b/sql/londiste/structure/functions.sql
@@ -52,5 +52,7 @@ select londiste.upgrade_schema();
 
 -- Group: Utility functions for handlers
 \i functions/londiste.create_partition.sql
+\i functions/londiste.is_obsolete_partition.sql
+\i functions/londiste.list_obsolete_partitions.sql
 \i functions/londiste.drop_obsolete_partitions.sql
 
diff --git a/sql/pgq_ext/structure/tables.sql b/sql/pgq_ext/structure/tables.sql
index 78a1b234..f916c86f 100644
--- a/sql/pgq_ext/structure/tables.sql
+++ b/sql/pgq_ext/structure/tables.sql
@@ -1,14 +1,14 @@
 -- ----------------------------------------------------------------------
 -- Section: Tables
 --
---      The pgq_ext schema exists to help in making sure that allenents get
---      processed and they get processed only once
+--      The pgq_ext schema exists to help in making sure that all events get
+--      processed and they get processed only once.
 --
--- Simple quidelines for avoiding duplicate events:
+-- Simple guidelines for avoiding duplicate events:
 -- 
 --      It is pretty burdensome to check if event is already processed,
---      especially on bulk data moving.  Here's a way how checking
---      individual event checks can be avoided by tracking processing of batches.
+--      especially on bulk data moving.  Here's a way how individual
+--      event checks can be avoided by tracking processing of batches.
 -- 
 --      First, consumer must guarantee that it processes all events in one tx.
 -- 
diff --git a/sql/pgq_node/functions/pgq_node.unregister_subscriber.sql b/sql/pgq_node/functions/pgq_node.unregister_subscriber.sql
index 777607e9..b7d476e6 100644
--- a/sql/pgq_node/functions/pgq_node.unregister_subscriber.sql
+++ b/sql/pgq_node/functions/pgq_node.unregister_subscriber.sql
@@ -30,13 +30,13 @@ begin
         return;
     end if;
 
-    perform pgq.unregister_consumer(i_queue_name, n_wm_name);
-    perform pgq.unregister_consumer(i_queue_name, worker_name);
-
     delete from pgq_node.subscriber_info
         where queue_name = i_queue_name
             and subscriber_node = i_remote_node_name;
 
+    perform pgq.unregister_consumer(i_queue_name, n_wm_name);
+    perform pgq.unregister_consumer(i_queue_name, worker_name);
+
     select 200, 'Subscriber unregistered: '||i_remote_node_name
         into ret_code, ret_note;
     return;