sync upgrade scripts with -stable

diff --git a/upgrade/Makefile b/upgrade/Makefile
index d9d494c17c83b7bdbb362f98c0f32d0eb4594b3e..b140882f9bfc1308a10f0f70e8402385f0252cec 100644 (file)
--- a/upgrade/Makefile
+++ b/upgrade/Makefile
@@ -1,5 +1,6 @@
 
-SQLS = v2.1.5_londiste.sql  v2.1.5_pgq_core.sql  v2.1.5_pgq_ext.sql
+#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
 
 SRCS = $(addprefix src/, $(SQLS))
 DSTS = $(addprefix final/, $(SQLS))

diff --git a/upgrade/final/v2.1.5_londiste.sql b/upgrade/final/v2.1.5_londiste.sql
index c37b4b5268787effb13265072a4d5949e12464ac..3b4b31f361f460eb43b0e2b7c2c4262b1dc4d399 100644 (file)
--- a/upgrade/final/v2.1.5_londiste.sql
+++ b/upgrade/final/v2.1.5_londiste.sql
@@ -18,7 +18,7 @@ create table londiste.subscriber_pending_triggers (
     primary key (table_name, trigger_name)
 );
 
-drop function londiste.denytrigger();
+-- drop function londiste.denytrigger();
 
 
 
@@ -34,7 +34,7 @@ begin
         select n1.nspname || '.' || t1.relname as from_table, n2.nspname || '.' || t2.relname as to_table,
             conname::text as fkey_name, 
             'alter table only ' || quote_ident(n1.nspname) || '.' || quote_ident(t1.relname)
-            || ' add constraint ' || quote_ident(fkey.fkey_name) || ' ' || pg_get_constraintdef(c.oid)
+            || ' add constraint ' || quote_ident(conname::text) || ' ' || pg_get_constraintdef(c.oid)
             as fkey_def
         from pg_constraint c, pg_namespace n1, pg_class t1, pg_namespace n2, pg_class t2
         where c.contype = 'f' and (c.conrelid = tbl_oid or c.confrelid = tbl_oid)

diff --git a/upgrade/final/v2.1.5_pgq_core.sql b/upgrade/final/v2.1.5_pgq_core.sql
index 1040ed16d0c1ce73a1f8b025a4d55a9c0c14a577..6cffed755b22264b10c31acd8b9f8c40293bfad8 100644 (file)
--- a/upgrade/final/v2.1.5_pgq_core.sql
+++ b/upgrade/final/v2.1.5_pgq_core.sql
@@ -1,7 +1,7 @@
 
 begin;
 
-alter table pgq.subscription  constraint subscription_ukey unique (sub_queue, sub_consumer);
+alter table pgq.subscription add constraint subscription_ukey unique (sub_queue, sub_consumer);
 create index rq_retry_owner_idx on pgq.retry_queue (ev_owner, ev_id);
 
 
@@ -322,8 +322,7 @@ returns setof text as $$
 --      List of table names.
 -- ----------------------------------------------------------------------
 declare
-    tbl text;
-    scm text;
+    row record;
 begin
     return next 'pgq.subscription';
     return next 'pgq.consumer';
@@ -332,21 +331,24 @@ begin
     return next 'pgq.retry_queue';
 
     -- include also txid, pgq_ext and londiste tables if they exist
-    for scm, tbl in 
-        select n.nspname, t.relname from pg_class t, pg_namespace n
+    for row in
+        select n.nspname as scm, t.relname as tbl
+          from pg_class t, pg_namespace n
          where n.oid = t.relnamespace
            and n.nspname = 'txid' and t.relname = 'epoch'
         union all
-        select n.nspname, t.relname from pg_class t, pg_namespace n
+        select n.nspname as scm, t.relname as tbl
+          from pg_class t, pg_namespace n
          where n.oid = t.relnamespace
            and n.nspname = 'londiste' and t.relname = 'completed'
         union all
-        select n.nspname, t.relname from pg_class t, pg_namespace n
+        select n.nspname as scm, t.relname as tbl
+          from pg_class t, pg_namespace n
          where n.oid = t.relnamespace
            and n.nspname = 'pgq_ext'
            and t.relname in ('completed_tick', 'completed_batch', 'completed_event', 'partial_batch')
     loop
-        return next scm || '.' || tbl;
+        return next row.scm || '.' || row.tbl;
     end loop;
 
     return;

diff --git a/upgrade/final/v2.1.6_londiste.sql b/upgrade/final/v2.1.6_londiste.sql
new file mode 100644 (file)
index 0000000..394a964
--- /dev/null
+++ b/upgrade/final/v2.1.6_londiste.sql
@@ -0,0 +1,17 @@
+
+begin;
+
+
+
+create or replace function londiste.version()
+returns text as $$
+begin
+    return '2.1.6';
+end;
+$$ language plpgsql;
+
+
+
+end;
+
+

diff --git a/upgrade/final/v2.1.6_pgq_ext.sql b/upgrade/final/v2.1.6_pgq_ext.sql
new file mode 100644 (file)
index 0000000..cfe2e66
--- /dev/null
+++ b/upgrade/final/v2.1.6_pgq_ext.sql
@@ -0,0 +1,17 @@
+
+begin;
+
+
+
+create or replace function pgq_ext.version()
+returns text as $$
+begin
+    return '2.1.6';
+end;
+$$ language plpgsql;
+
+
+
+end;
+
+

diff --git a/upgrade/src/v2.1.5_londiste.sql b/upgrade/src/v2.1.5_londiste.sql
index 5f641fa358efa64ff4e15e237b973070d2f1391d..9933aa1b14fd9a9516f419a9a6e78f05fe3e1380 100644 (file)
--- a/upgrade/src/v2.1.5_londiste.sql
+++ b/upgrade/src/v2.1.5_londiste.sql
@@ -17,7 +17,7 @@ create table londiste.subscriber_pending_triggers (
     primary key (table_name, trigger_name)
 );
 
-drop function londiste.denytrigger();
+-- drop function londiste.denytrigger();
 
 \i ../sql/londiste/functions/londiste.find_table_fkeys.sql
 \i ../sql/londiste/functions/londiste.find_table_triggers.sql

diff --git a/upgrade/src/v2.1.5_pgq_core.sql b/upgrade/src/v2.1.5_pgq_core.sql
index f2695d7d8c996e26ccb6f08d4994b28aac768789..8286973eef707b86d795dd5d9756d6f721834857 100644 (file)
--- a/upgrade/src/v2.1.5_pgq_core.sql
+++ b/upgrade/src/v2.1.5_pgq_core.sql
@@ -1,6 +1,6 @@
 begin;
 
-alter table pgq.subscription  constraint subscription_ukey unique (sub_queue, sub_consumer);
+alter table pgq.subscription add constraint subscription_ukey unique (sub_queue, sub_consumer);
 create index rq_retry_owner_idx on pgq.retry_queue (ev_owner, ev_id);
 
 \i ../sql/pgq/functions/pgq.current_event_table.sql

diff --git a/upgrade/src/v2.1.6_londiste.sql b/upgrade/src/v2.1.6_londiste.sql
new file mode 100644 (file)
index 0000000..57cff96
--- /dev/null
+++ b/upgrade/src/v2.1.6_londiste.sql
@@ -0,0 +1,6 @@
+begin;
+
+\i ../sql/londiste/functions/londiste.version.sql
+
+end;
+

diff --git a/upgrade/src/v2.1.6_pgq_ext.sql b/upgrade/src/v2.1.6_pgq_ext.sql
new file mode 100644 (file)
index 0000000..3aa3e82
--- /dev/null
+++ b/upgrade/src/v2.1.6_pgq_ext.sql
@@ -0,0 +1,6 @@
+begin;
+
+\i ../sql/pgq_ext/functions/version.sql
+
+end;
+