2to3 upgrade: Add DROP FUNCTION to work around param renaming.

Also stop generating the script, it's final now.

diff --git a/upgrade/Makefile b/upgrade/Makefile
index 33d528152df2897f3ea2e2ed9d2aaac6be775584..6cf0f859eea6f7c1f1e8251b52759945d8f73c53 100644 (file)
--- a/upgrade/Makefile
+++ b/upgrade/Makefile
@@ -1,7 +1,7 @@
 
 #SQLS = v2.1.5_londiste.sql  v2.1.5_pgq_core.sql  v2.1.5_pgq_ext.sql
 #SQLS = v2.1.6_londiste.sql  v2.1.6_pgq_ext.sql
-SQLS = v3.0_pgq_core.sql
+#SQLS = v3.0_pgq_core.sql
 
 SRCS = $(addprefix src/, $(SQLS))
 DSTS = $(addprefix final/, $(SQLS))

diff --git a/upgrade/final/v3.0_pgq_core.sql b/upgrade/final/v3.0_pgq_core.sql
index c3253f26b5a8086d7b4a832a4ac2d9deb802aa93..f2a3f981cdc9cb176b9b6a64d6b2194dc3a29e5d 100644 (file)
--- a/upgrade/final/v3.0_pgq_core.sql
+++ b/upgrade/final/v3.0_pgq_core.sql
@@ -1768,6 +1768,7 @@ begin
 end;
 $$ language plpgsql;
 
+drop function pgq.next_batch(text, text);
 create or replace function pgq.next_batch(
     in i_queue_name text,
     in i_consumer_name text)