diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | sql/pgq/Makefile | 4 | ||||
| -rw-r--r-- | sql/pgq/functions/pgq.unregister_consumer.sql | 8 | ||||
| -rw-r--r-- | sql/pgq/functions/pgq.version.sql | 2 | ||||
| -rw-r--r-- | sql/pgq/pgq.control | 2 |
7 files changed, 18 insertions, 8 deletions
@@ -1,5 +1,5 @@ -2014-10-29 - SkyTools 3.2.5 +2014-11-05 - SkyTools 3.2.6 = Minor features = diff --git a/configure.ac b/configure.ac index 11eb1fc4..a003310c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(skytools, 3.2.5) +AC_INIT(skytools, 3.2.6) AC_CONFIG_SRCDIR(python/londiste.py) AC_CONFIG_HEADER(lib/usual/config.h) AC_PREREQ([2.59]) diff --git a/debian/changelog b/debian/changelog index 17d4a432..113b9820 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +skytools3 (3.2.6) experimental; urgency=low + + * v3.2.6 + + -- martinko <[email protected]> Wed, 05 Nov 2014 16:00:00 +0100 + skytools3 (3.2.5) experimental; urgency=low * v3.2.5 diff --git a/sql/pgq/Makefile b/sql/pgq/Makefile index 19371d25..e4617e53 100644 --- a/sql/pgq/Makefile +++ b/sql/pgq/Makefile @@ -1,8 +1,8 @@ EXTENSION = pgq -EXT_VERSION = 3.2.3 -EXT_OLD_VERSIONS = 3.1 3.1.1 3.1.2 3.1.3 3.1.6 3.2 +EXT_VERSION = 3.2.6 +EXT_OLD_VERSIONS = 3.1 3.1.1 3.1.2 3.1.3 3.1.6 3.2 3.2.3 DOCS = README.pgq diff --git a/sql/pgq/functions/pgq.unregister_consumer.sql b/sql/pgq/functions/pgq.unregister_consumer.sql index eeb2524f..9921a069 100644 --- a/sql/pgq/functions/pgq.unregister_consumer.sql +++ b/sql/pgq/functions/pgq.unregister_consumer.sql @@ -63,8 +63,12 @@ begin delete from pgq.subscription where sub_id = x_sub_id; - delete from pgq.consumer - where co_id = _consumer_id; + perform 1 from pgq.subscription + where sub_consumer = _consumer_id; + if not found then + delete from pgq.consumer + where co_id = _consumer_id; + end if; return _sub_id_cnt; end if; diff --git a/sql/pgq/functions/pgq.version.sql b/sql/pgq/functions/pgq.version.sql index 4160245c..1be14467 100644 --- a/sql/pgq/functions/pgq.version.sql +++ b/sql/pgq/functions/pgq.version.sql @@ -7,7 +7,7 @@ returns text as $$ -- version and only bumped when database code changes. -- ---------------------------------------------------------------------- begin - return '3.2.3'; + return '3.2.6'; end; $$ language plpgsql; diff --git a/sql/pgq/pgq.control b/sql/pgq/pgq.control index acc51cae..deb357c1 100644 --- a/sql/pgq/pgq.control +++ b/sql/pgq/pgq.control @@ -1,6 +1,6 @@ # pgq extension comment = 'Generic queue for PostgreSQL' -default_version = '3.2.3' +default_version = '3.2.6' relocatable = false superuser = true schema = 'pg_catalog' |