Merge branch 'master' of skype-git:/git/dba/skytools-3

5 files changed, 14 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 2a204068..93cec90c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,8 @@
-2012-04-09  -  SkyTools 3.0.1  -  "All The Snow You Can Eat"
+2012-04-18  -  SkyTools 3.0.1  -  "All The Snow You Can Eat"
 
   = Features =
 
-    * skytools.config: new .getbytes() method to suppoer
+    * skytools.config: new .getbytes() method to support
       human-readable sizes.
 
   = Fixes =
@@ -17,6 +17,13 @@
 
     * pgqd(libusual): ignore EINTR on close()
 
+    * Better error message in londiste.handler.dispatch
+      when part_field is NULL.
+
+    * Bump internal version in pgq/pgq_coop/pgq_node schemas.
+      Seems I forgot to do it for 3.0, probably because
+      there were doc-only changes in SQL code.
+
 2012-03-17  -  SkyTools 3.0  -  "Business Advantage"
 
   = Major New Features =
diff --git a/python/londiste/handlers/dispatch.py b/python/londiste/handlers/dispatch.py
index 95d08e72..6505736a 100644
--- a/python/londiste/handlers/dispatch.py
+++ b/python/londiste/handlers/dispatch.py
@@ -838,6 +838,8 @@ class Dispatcher(BaseHandler):
             dtm = datetime.datetime.now()
         elif self.conf.part_mode == 'date_field':
             dt_str = data[self.conf.part_field]
+            if dt_str is None:
+                raise Exception('part_field(%s) is NULL: %s' % (self.conf.part_field, ev))
             dtm = datetime.datetime.strptime(dt_str[:19], "%Y-%m-%d %H:%M:%S")
         else:
             raise UsageError('Bad value for part_mode: %s' %\
diff --git a/sql/pgq/functions/pgq.version.sql b/sql/pgq/functions/pgq.version.sql
index c08b1788..2f5e5764 100644
--- a/sql/pgq/functions/pgq.version.sql
+++ b/sql/pgq/functions/pgq.version.sql
@@ -7,7 +7,7 @@ returns text as $$
 --      that is only bumped when PGQ database code changes.
 -- ----------------------------------------------------------------------
 begin
-    return '3.0.0.13';
+    return '3.0.0.14';
 end;
 $$ language plpgsql;
 
diff --git a/sql/pgq_coop/functions/pgq_coop.version.sql b/sql/pgq_coop/functions/pgq_coop.version.sql
index 80bb5c59..3ab14d05 100644
--- a/sql/pgq_coop/functions/pgq_coop.version.sql
+++ b/sql/pgq_coop/functions/pgq_coop.version.sql
@@ -8,7 +8,7 @@ returns text as $$
 --      with suffix that is only bumped when pgq_coop database code changes.
 -- ----------------------------------------------------------------------
 begin
-    return '3.0.0.3';
+    return '3.0.0.4';
 end;
 $$ language plpgsql;
 
diff --git a/sql/pgq_node/functions/pgq_node.version.sql b/sql/pgq_node/functions/pgq_node.version.sql
index 797713ed..d2c1ad0a 100644
--- a/sql/pgq_node/functions/pgq_node.version.sql
+++ b/sql/pgq_node/functions/pgq_node.version.sql
@@ -2,7 +2,7 @@
 create or replace function pgq_node.version()
 returns text as $$
 begin
-    return '3.0.0.13';
+    return '3.0.0.14';
 end;
 $$ language plpgsql;