Support for extensions upgrade

Needed for pgq & pgq_coop that have changed.

Also move more common code to common-pgxs.mk

diff --git a/debian/genpg.sh b/debian/genpg.sh
index 355149260eef7ee11d6bba0cf09628ecad8972a5..b096f6650a8a4ad94acd908d296ab8764a5b6383 100755 (executable)
--- a/debian/genpg.sh
+++ b/debian/genpg.sh
@@ -39,12 +39,21 @@ usr/share/postgresql/$v/contrib/oldgrants_pgq.sql
 EOF
 
 if test "$v" = "9.1" -o "$v" = "9.2"; then
-  modver="3.1"
+  pgq_version="3.1.1"; pgq_old_versions="3.1"
+  pgq_coop_version="3.1.1"; pgq_coop_old_versions="3.1"
+  pgq_node_version="3.1"; pgq_node_old_versions=""
+  pgq_ext_version="3.1"; pgq_ext_old_versions=""
+  londiste_version="3.1"; londiste_old_versions=""
   for mod in pgq pgq_node pgq_coop pgq_ext londiste; do
     (
+      modver=`eval echo \\${${mod}_version}`
       echo "usr/share/postgresql/$v/extension/${mod}.control"
       echo "usr/share/postgresql/$v/extension/${mod}--${modver}.sql"
       echo "usr/share/postgresql/$v/extension/${mod}--unpackaged--${modver}.sql"
+      oldvers=`eval echo \\${${mod}_old_versions}`
+      for old in ${oldvers}; do
+        echo "usr/share/postgresql/$v/extension/${mod}--${old}--${modver}.sql"
+      done
     ) >> "postgresql-$v-pgq3.install"
   done
 fi

diff --git a/debian/postgresql-9.1-pgq3.install b/debian/postgresql-9.1-pgq3.install
index f9708aa5779201f5ba9a92f345741a8b05e6fa34..f551f195a14affe70b8ac68fe974ba00a756242c 100644 (file)
--- a/debian/postgresql-9.1-pgq3.install
+++ b/debian/postgresql-9.1-pgq3.install
@@ -23,14 +23,16 @@ usr/share/postgresql/9.1/contrib/oldgrants_pgq_ext.sql
 usr/share/postgresql/9.1/contrib/oldgrants_pgq_node.sql
 usr/share/postgresql/9.1/contrib/oldgrants_pgq.sql
 usr/share/postgresql/9.1/extension/pgq.control
-usr/share/postgresql/9.1/extension/pgq--3.1.sql
-usr/share/postgresql/9.1/extension/pgq--unpackaged--3.1.sql
+usr/share/postgresql/9.1/extension/pgq--3.1.1.sql
+usr/share/postgresql/9.1/extension/pgq--unpackaged--3.1.1.sql
+usr/share/postgresql/9.1/extension/pgq--3.1--3.1.1.sql
 usr/share/postgresql/9.1/extension/pgq_node.control
 usr/share/postgresql/9.1/extension/pgq_node--3.1.sql
 usr/share/postgresql/9.1/extension/pgq_node--unpackaged--3.1.sql
 usr/share/postgresql/9.1/extension/pgq_coop.control
-usr/share/postgresql/9.1/extension/pgq_coop--3.1.sql
-usr/share/postgresql/9.1/extension/pgq_coop--unpackaged--3.1.sql
+usr/share/postgresql/9.1/extension/pgq_coop--3.1.1.sql
+usr/share/postgresql/9.1/extension/pgq_coop--unpackaged--3.1.1.sql
+usr/share/postgresql/9.1/extension/pgq_coop--3.1--3.1.1.sql
 usr/share/postgresql/9.1/extension/pgq_ext.control
 usr/share/postgresql/9.1/extension/pgq_ext--3.1.sql
 usr/share/postgresql/9.1/extension/pgq_ext--unpackaged--3.1.sql

diff --git a/debian/postgresql-9.2-pgq3.install b/debian/postgresql-9.2-pgq3.install
index 50bc2e38a9e3fe5ea09e929fde95ba99575f96cb..4935bf2fdba1eda1805321f57b7b9ca4d4319748 100644 (file)
--- a/debian/postgresql-9.2-pgq3.install
+++ b/debian/postgresql-9.2-pgq3.install
@@ -23,14 +23,16 @@ usr/share/postgresql/9.2/contrib/oldgrants_pgq_ext.sql
 usr/share/postgresql/9.2/contrib/oldgrants_pgq_node.sql
 usr/share/postgresql/9.2/contrib/oldgrants_pgq.sql
 usr/share/postgresql/9.2/extension/pgq.control
-usr/share/postgresql/9.2/extension/pgq--3.1.sql
-usr/share/postgresql/9.2/extension/pgq--unpackaged--3.1.sql
+usr/share/postgresql/9.2/extension/pgq--3.1.1.sql
+usr/share/postgresql/9.2/extension/pgq--unpackaged--3.1.1.sql
+usr/share/postgresql/9.2/extension/pgq--3.1--3.1.1.sql
 usr/share/postgresql/9.2/extension/pgq_node.control
 usr/share/postgresql/9.2/extension/pgq_node--3.1.sql
 usr/share/postgresql/9.2/extension/pgq_node--unpackaged--3.1.sql
 usr/share/postgresql/9.2/extension/pgq_coop.control
-usr/share/postgresql/9.2/extension/pgq_coop--3.1.sql
-usr/share/postgresql/9.2/extension/pgq_coop--unpackaged--3.1.sql
+usr/share/postgresql/9.2/extension/pgq_coop--3.1.1.sql
+usr/share/postgresql/9.2/extension/pgq_coop--unpackaged--3.1.1.sql
+usr/share/postgresql/9.2/extension/pgq_coop--3.1--3.1.1.sql
 usr/share/postgresql/9.2/extension/pgq_ext.control
 usr/share/postgresql/9.2/extension/pgq_ext--3.1.sql
 usr/share/postgresql/9.2/extension/pgq_ext--unpackaged--3.1.sql

diff --git a/sql/Makefile b/sql/Makefile
index b82520ef576b986446e11b08c408dbfbe8695e78..6ab01592ceb225c710f1dff80dfea1775ecb05ae 100644 (file)
--- a/sql/Makefile
+++ b/sql/Makefile
@@ -3,7 +3,7 @@ include ../config.mak
 
 SUBDIRS = londiste pgq pgq_coop pgq_ext pgq_node ticker txid
 
-all install clean distclean installcheck:
+all install clean distclean installcheck test:
        for dir in $(SUBDIRS); do \
          $(MAKE) -C $$dir $@ \
                DESTDIR="$(DESTDIR)" \

diff --git a/sql/common-pgxs.mk b/sql/common-pgxs.mk
index 2253450449095c9812376890c02b5e110249be7c..bcaa6ebcc06a018cbd656657f6c8d71924b9626b 100644 (file)
--- a/sql/common-pgxs.mk
+++ b/sql/common-pgxs.mk
@@ -5,14 +5,23 @@
 
 # Variables that are used when extensions are available
 Extension_data ?=
-Extension_data_built ?=
+Extension_data_built ?= $(EXTENSION)--$(EXT_VERSION).sql $(EXTENSION)--unpackaged--$(EXT_VERSION).sql
 Extension_regress ?=
 
 # Variables that are used when extensions are not available
 Contrib_data ?=
-Contrib_data_built ?=
+Contrib_data_built = $(EXTENSION).sql $(EXTENSION).upgrade.sql \
+               structure/newgrants_$(EXTENSION).sql \
+               structure/oldgrants_$(EXTENSION).sql
+
 Contrib_regress ?=
 
+EXT_VERSION ?=
+EXT_OLD_VERSIONS ?= 
+
+Extension_upgrade_files = $(if $(EXT_OLD_VERSIONS),$(foreach v,$(EXT_OLD_VERSIONS),$(EXTENSION)--$(v)--$(EXT_VERSION).sql))
+Extension_data_built += $(Extension_upgrade_files)
+
 # Should the Contrib* files installed (under ../contrib/)
 # even when extensions are available?
 Contrib_install_always ?= no
@@ -33,6 +42,14 @@ EXTRA_CLEAN += $(call IfExt,$(Contrib_data_built),$(Extension_data_built)) test.
 override CONTRIB_TESTDB = regression
 REGRESS_OPTS = --load-language=plpgsql --dbname=$(CONTRIB_TESTDB)
 
+#
+# Calculate actual sql files
+#
+
+SQLS  = $(shell sed -e 's/^[^\\].*//' -e 's/\\i //' structure/install.sql)
+FUNCS = $(shell sed -e 's/^[^\\].*//' -e 's/\\i //' $(SQLS))
+SRCS = $(SQLS) $(FUNCS)
+
 #
 # load PGXS
 #
@@ -41,6 +58,15 @@ PG_CONFIG ?= pg_config
 PGXS = $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 
+#
+# common tools
+#
+
+NDOC = NaturalDocs
+NDOCARGS = -r -o html docs/html -p docs -i docs/sql
+CATSQL = ../../scripts/catsql.py
+GRANTFU = ../../scripts/grantfu.py
+
 #
 # build rules, in case Contrib data must be always installed
 #
@@ -70,4 +96,40 @@ test: install
 ack:
        cp results/*.out expected/
 
-.PHONY: test ack installdirs-old-contrib install-old-contrib
+cleandox:
+       rm -rf docs/html docs/Data docs/sql
+
+clean: cleandox
+
+.PHONY: test ack installdirs-old-contrib install-old-contrib cleandox dox
+
+#
+# common files
+#
+
+$(EXTENSION)--$(EXT_VERSION).sql: $(EXTENSION).sql structure/ext_postproc.sql
+       $(CATSQL) $^ > $@
+
+$(EXTENSION)--unpackaged--$(EXT_VERSION).sql: $(EXTENSION).upgrade.sql structure/ext_unpackaged.sql structure/ext_postproc.sql
+       $(CATSQL) $^ > $@
+
+$(EXTENSION).sql: $(SRCS)
+       $(CATSQL) structure/install.sql > $@
+
+$(EXTENSION).upgrade.sql: $(SRCS)
+       $(CATSQL) structure/upgrade.sql > $@
+
+ifneq ($(Extension_upgrade_files),)
+$(Extension_upgrade_files): $(EXTENSION).upgrade.sql
+       cp $< $@
+endif
+
+structure/newgrants_$(EXTENSION).sql: structure/grants.ini
+       $(GRANTFU) -t -r -d $< > $@
+
+structure/oldgrants_$(EXTENSION).sql: structure/grants.ini structure/grants.sql
+       echo "begin;" > $@
+       $(GRANTFU) -R -o $< >> $@
+       cat structure/grants.sql >> $@
+       echo "commit;" >> $@
+

diff --git a/sql/londiste/Makefile b/sql/londiste/Makefile
index 31ff8b43c6268091981dbfe04598dd9759ce8c43..4c1354a5d50021ffd16a6de9a27a0c44bd00a075 100644 (file)
--- a/sql/londiste/Makefile
+++ b/sql/londiste/Makefile
@@ -1,11 +1,8 @@
 
 EXTENSION = londiste
 
-Contrib_data_built = londiste.sql londiste.upgrade.sql \
-            structure/oldgrants_londiste.sql \
-            structure/newgrants_londiste.sql
-
-Extension_data_built = londiste--3.1.sql londiste--unpackaged--3.1.sql
+EXT_VERSION = 3.1
+EXT_OLD_VERSIONS =
 
 base_regress = londiste_provider londiste_subscriber \
               londiste_fkeys londiste_execute londiste_seqs londiste_merge \
@@ -16,38 +13,8 @@ Extension_regress = init_ext $(base_regress)
 
 Contrib_install_always = yes
 
-SQLS  = $(shell sed -e 's/^[^\\].*//' -e 's/\\i //' structure/install.sql)
-FUNCS = $(shell sed -e 's/^[^\\].*//' -e 's/\\i //' $(SQLS))
-SRCS = $(SQLS) $(FUNCS)
-
-NDOC = NaturalDocs
-NDOCARGS = -r -o html docs/html -p docs -i docs/sql
-CATSQL = ../../scripts/catsql.py
-GRANTFU = ../../scripts/grantfu.py
-
 include ../common-pgxs.mk
 
-londiste--3.1.sql: londiste.sql structure/ext_postproc.sql
-       cat $^ > $@
-
-londiste--unpackaged--3.1.sql: londiste.upgrade.sql structure/ext_unpackaged.sql structure/ext_postproc.sql
-       cat $^ > $@
-
-londiste.sql: $(SRCS)
-       $(CATSQL) $(SQLS) > $@
-
-londiste.upgrade.sql: $(SRCS)
-       $(CATSQL) structure/upgrade.sql > $@
-
-structure/newgrants_londiste.sql: structure/grants.ini
-       $(GRANTFU) -r -d -t $< > $@
-
-structure/oldgrants_londiste.sql: structure/grants.ini
-       echo "begin;" > $@
-       $(GRANTFU) -R -o $< >> $@
-       cat structure/grants.sql >> $@
-       echo "commit;" >> $@
-
 dox: cleandox
        mkdir -p docs/html
        mkdir -p docs/sql
@@ -55,6 +22,3 @@ dox: cleandox
        $(CATSQL) --ndoc structure/functions.sql > docs/sql/functions.sql
        $(NDOC) $(NDOCARGS)
 
-cleandox:
-       rm -rf docs/html docs/Data docs/sql
-

diff --git a/sql/pgq/Makefile b/sql/pgq/Makefile
index 1a21df424119c8aa0dca1701c5dd5fffa808af36..27cb6e1261cd958c6bf1fb65f73b30315e53ac13 100644 (file)
--- a/sql/pgq/Makefile
+++ b/sql/pgq/Makefile
@@ -1,34 +1,21 @@
 
 EXTENSION = pgq
 
-DOCS = README.pgq
+EXT_VERSION = 3.1.1
+EXT_OLD_VERSIONS = 3.1
 
-Extension_data_built = pgq--3.1.sql pgq--unpackaged--3.1.sql
+DOCS = README.pgq
 
-Contrib_data_built = pgq.sql pgq.upgrade.sql structure/oldgrants_pgq.sql structure/newgrants_pgq.sql
 Contrib_data = structure/uninstall_pgq.sql
 
 Contrib_regress   = pgq_init_noext pgq_core pgq_perms logutriga sqltriga $(trunc_test)
 Extension_regress = pgq_init_ext   pgq_core pgq_perms logutriga sqltriga $(trunc_test)
 
-Contrib_install_always = yes
-
 # MAJORVERSION was defined in 8.4
 trunc_test = $(if $(MAJORVERSION),trunctrg)
 
-# scripts that load other sql files
-LDRS = structure/func_internal.sql structure/func_public.sql structure/triggers.sql
-FUNCS = $(shell sed -e 's/^[^\\].*//' -e 's/\\i //' $(LDRS))
-SRCS = structure/tables.sql structure/grants.sql structure/install.sql \
-       structure/uninstall_pgq.sql $(FUNCS)
-
 include ../common-pgxs.mk
 
-NDOC = NaturalDocs
-NDOCARGS = -r -o html docs/html -p docs -i docs/sql
-CATSQL = ../../scripts/catsql.py
-GRANTFU = ../../scripts/grantfu.py
-
 SUBDIRS = lowlevel triggers
 
 # PGXS does not have subdir support, thus hack to recurse into lowlevel/
@@ -47,32 +34,6 @@ sub-all sub-install sub-clean sub-distclean:
 lowlevel/pgq_lowlevel.sql: sub-all
 triggers/pgq_triggers.sql: sub-all
 
-#
-# combined SQL files
-#
-
-pgq--3.1.sql: pgq.sql structure/ext_postproc.sql
-       cat $^ > $@
-
-pgq--unpackaged--3.1.sql: pgq.upgrade.sql structure/ext_unpackaged.sql structure/ext_postproc.sql
-       cat $^ > $@
-
-pgq.sql: $(SRCS)
-       $(CATSQL) structure/install.sql > $@
-
-# fixme: use LDRS here, to upgrade triggers
-pgq.upgrade.sql: $(SRCS)
-       $(CATSQL) structure/upgrade.sql > $@
-
-structure/newgrants_pgq.sql: structure/grants.ini
-       $(GRANTFU) -t -r -d $< > $@
-
-structure/oldgrants_pgq.sql: structure/grants.ini structure/grants.sql
-       echo "begin;" > $@
-       $(GRANTFU) -R -o $< >> $@
-       cat structure/grants.sql >> $@
-       echo "commit;" >> $@
-
 #
 # docs
 #
@@ -85,11 +46,3 @@ dox: cleandox $(SRCS)
        $(CATSQL) --ndoc structure/triggers.sql > docs/sql/triggers.sql
        $(NDOC) $(NDOCARGS)
 
-cleandox:
-       rm -rf docs/html docs/Data docs/sql
-
-clean: cleandox
-
-test: $(Contrib_data_built)
-
-.PHONY: cleandox dox

diff --git a/sql/pgq/functions/pgq.version.sql b/sql/pgq/functions/pgq.version.sql
index d8baec482d60871a2c9b8af561f06f3b2f063640..5405f01cbed7bc7a6b40baf8c35ccbf350c06b61 100644 (file)
--- a/sql/pgq/functions/pgq.version.sql
+++ b/sql/pgq/functions/pgq.version.sql
@@ -7,7 +7,7 @@ returns text as $$
 --      and only bumped when database code changes.
 -- ----------------------------------------------------------------------
 begin
-    return '3.1.0.0';
+    return '3.1.1';
 end;
 $$ language plpgsql;
 

diff --git a/sql/pgq_coop/Makefile b/sql/pgq_coop/Makefile
index 6d88236db05310702adc528b60c968d86193cee7..cc82d217dfa20b9a95811e6bd1a780801d8db4b4 100644 (file)
--- a/sql/pgq_coop/Makefile
+++ b/sql/pgq_coop/Makefile
@@ -1,54 +1,14 @@
 
 EXTENSION = pgq_coop
 
-Extension_data_built = pgq_coop--3.1.sql pgq_coop--unpackaged--3.1.sql
-Contrib_data_built = pgq_coop.sql pgq_coop.upgrade.sql \
-            structure/newgrants_pgq_coop.sql \
-            structure/oldgrants_pgq_coop.sql
+EXT_VERSION = 3.1.1
+EXT_OLD_VERSIONS = 3.1
 
 Contrib_regress   = pgq_coop_init_noext pgq_coop_test
 Extension_regress = pgq_coop_init_ext   pgq_coop_test
 
-Contrib_install_always = yes
-
-SQL_FULL = structure/schema.sql structure/functions.sql structure/grants.sql
-FUNCS = $(shell sed -n -e '/^\\/{s/\\i //;p}' structure/functions.sql)
-SRCS = $(SQL_FULL) $(FUNCS)
-
 include ../common-pgxs.mk
 
-NDOC = NaturalDocs
-NDOCARGS = -r -o html docs/html -p docs -i docs/sql
-CATSQL = ../../scripts/catsql.py
-GRANTFU = ../../scripts/grantfu.py
-
-
-#
-# combined SQL files
-#
-
-pgq_coop--3.1.sql: pgq_coop.sql
-       cat $< > $@
-
-#pgq_coop--unpackaged--3.1.sql: structure/ext_unpackaged.sql pgq_coop.upgrade.sql
-pgq_coop--unpackaged--3.1.sql: pgq_coop.upgrade.sql structure/ext_unpackaged.sql
-       cat $< > $@
-
-pgq_coop.sql: $(SRCS)
-       $(CATSQL) structure/install.sql > $@
-
-pgq_coop.upgrade.sql: $(SRCS)
-       $(CATSQL) structure/upgrade.sql > $@
-
-structure/newgrants_pgq_coop.sql: structure/grants.ini
-       $(GRANTFU) -t -r -d $< > $@
-
-structure/oldgrants_pgq_coop.sql: structure/grants.ini structure/grants.sql
-       echo "begin;" > $@
-       $(GRANTFU) -R -o $< >> $@
-       cat structure/grants.sql >> $@
-       echo "commit;" >> $@
-
 #
 # docs
 #
@@ -58,8 +18,3 @@ dox: cleandox $(SRCS)
        $(CATSQL) --ndoc structure/functions.sql > docs/sql/functions.sql
        $(NDOC) $(NDOCARGS)
 
-cleandox:
-       rm -rf docs/html docs/Data docs/sql
-
-clean: cleandox
-

diff --git a/sql/pgq_coop/functions/pgq_coop.next_batch.sql b/sql/pgq_coop/functions/pgq_coop.next_batch.sql
index 7863acfea6eb4104714d815ee6a970f5763a3d6a..9f44300bdef6e86f9f72eaf490790a9e1dab78e8 100644 (file)
--- a/sql/pgq_coop/functions/pgq_coop.next_batch.sql
+++ b/sql/pgq_coop/functions/pgq_coop.next_batch.sql
@@ -143,7 +143,15 @@ begin
           and s.sub_consumer = c.co_id
         for update of s;
     if not found then
-        raise exception 'main consumer not found';
+        perform pgq_coop.register_subconsumer(i_queue_name, i_consumer_name, i_subconsumer_name);
+        -- fetch the data again
+        select q.queue_id, c.co_id, s.sub_next_tick
+            into _queue_id, _consumer_id, _cur_tick
+            from pgq.queue q, pgq.consumer c, pgq.subscription s
+            where q.queue_name = i_queue_name
+              and c.co_name = i_consumer_name
+              and s.sub_queue = q.queue_id
+              and s.sub_consumer = c.co_id;
     end if;
     if _cur_tick is not null then
         raise exception 'main consumer has batch open?';

diff --git a/sql/pgq_coop/pgq_coop.control b/sql/pgq_coop/pgq_coop.control
index 804e1f5105445154c26f213a3ccf07af05379616..8f7d2155104160efd63a37d9067d79f1bef50c71 100644 (file)
--- a/sql/pgq_coop/pgq_coop.control
+++ b/sql/pgq_coop/pgq_coop.control
@@ -1,6 +1,6 @@
 # pgq_coop
 comment = 'Cooperative queue consuming for PgQ'
-default_version = '3.1'
+default_version = '3.1.1'
 relocatable = false
 superuser = true
 schema = 'pg_catalog'

diff --git a/sql/pgq_coop/sql/pgq_coop_init_ext.sql b/sql/pgq_coop/sql/pgq_coop_init_ext.sql
index 88f031d51e8f43f483910a34705370212fb69ea1..820f1d321123d34351804f867173325c0a771652 100644 (file)
--- a/sql/pgq_coop/sql/pgq_coop_init_ext.sql
+++ b/sql/pgq_coop/sql/pgq_coop_init_ext.sql
@@ -8,5 +8,8 @@ create extension pgq;
 create extension pgq_coop from 'unpackaged';
 drop extension pgq_coop;
 
+-- workaround for postgres bug
+drop schema if exists pgq_coop;
+
 create extension pgq_coop;
 

diff --git a/sql/pgq_coop/structure/ext_postproc.sql b/sql/pgq_coop/structure/ext_postproc.sql
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/sql/pgq_ext/Makefile b/sql/pgq_ext/Makefile
index 92ddbfbc16eee0cfe219845bab7be6c2d3d85fd6..8f74f677090c7b9355a9711f18cab433835b8789 100644 (file)
--- a/sql/pgq_ext/Makefile
+++ b/sql/pgq_ext/Makefile
@@ -1,51 +1,16 @@
 
 EXTENSION = pgq_ext
 
-Contrib_data_built = pgq_ext.sql pgq_ext.upgrade.sql \
-            structure/oldgrants_pgq_ext.sql \
-            structure/newgrants_pgq_ext.sql
-Contrib_regress = init_noext test_pgq_ext test_upgrade
+EXT_VERSION = 3.1
+EXT_OLD_VERSIONS =
 
+Contrib_regress = init_noext test_pgq_ext test_upgrade
 Extension_regress = init_ext test_pgq_ext
-Extension_data_built = pgq_ext--3.1.sql pgq_ext--unpackaged--3.1.sql
-
-Contrib_install_always = yes
 
 DOCS = README.pgq_ext
 
-SRCS = $(wildcard functions/*.sql structure/*.sql)
-
-GRANTFU = ../../scripts/grantfu.py
-CATSQL = ../../scripts/catsql.py
-NDOC = NaturalDocs
-NDOCARGS = -r -o html docs/html -p docs -i docs/sql
-
 include ../common-pgxs.mk
 
-pgq_ext--3.1.sql: pgq_ext.sql structure/ext_postproc.sql
-       cat $^ > $@
-
-pgq_ext--unpackaged--3.1.sql: pgq_ext.upgrade.sql structure/ext_unpackaged.sql structure/ext_postproc.sql
-       cat $^ > $@
-
-pgq_ext.sql: $(SRCS)
-       $(CATSQL) structure/install.sql > $@
-
-pgq_ext.upgrade.sql: $(SRCS)
-       $(CATSQL) structure/upgrade.sql > $@
-
-structure/newgrants_pgq_ext.sql: structure/grants.ini
-       $(GRANTFU) -t -r -d $< > $@
-
-structure/oldgrants_pgq_ext.sql: structure/grants.ini structure/grants.sql
-       echo "begin;" > $@
-       $(GRANTFU) -R -o $< >> $@
-       cat structure/grants.sql >> $@
-       echo "commit;" >> $@
-
-cleandox:
-       rm -rf docs/html docs/Data docs/sql
-
 dox: cleandox $(SRCS)
        mkdir -p docs/html
        mkdir -p docs/sql

diff --git a/sql/pgq_node/Makefile b/sql/pgq_node/Makefile
index a42a7fad215dd8bc25b1078b2f39aa03c9d23d50..2ea8b904aa42aca1182dfc51a99cc4b569fafc30 100644 (file)
--- a/sql/pgq_node/Makefile
+++ b/sql/pgq_node/Makefile
@@ -1,57 +1,18 @@
 
 EXTENSION = pgq_node
 
-Extension_data_built = pgq_node--3.1.sql pgq_node--unpackaged--3.1.sql
-Contrib_data_built = pgq_node.sql pgq_node.upgrade.sql \
-            structure/newgrants_pgq_node.sql \
-            structure/oldgrants_pgq_node.sql
+EXT_VERSION = 3.1
+EXT_OLD_VERSIONS =
 
 Extension_regress = pgq_node_init_ext   pgq_node_test
 Contrib_regress   = pgq_node_init_noext pgq_node_test
 
-Contrib_install_always = yes
-
-LDRS = structure/functions.sql
-FUNCS = $(shell sed -e 's/^[^\\].*//' -e 's/\\i //' $(LDRS))
-SRCS = structure/tables.sql structure/functions.sql structure/grants.sql \
-       $(FUNCS)
-
 include ../common-pgxs.mk
 
-NDOC = NaturalDocs
-NDOCARGS = -r -o html docs/html -p docs -i docs/sql
-CATSQL = ../../scripts/catsql.py
-GRANTFU = ../../scripts/grantfu.py
-
-#
-# combined SQL files
-#
-
-pgq_node--3.1.sql: pgq_node.sql structure/ext_postproc.sql
-       cat $^ > $@
-
-pgq_node--unpackaged--3.1.sql: pgq_node.upgrade.sql structure/ext_unpackaged.sql structure/ext_postproc.sql
-       cat $^ > $@
-
-pgq_node.sql: $(SRCS)
-       $(CATSQL) structure/install.sql > $@
-
-pgq_node.upgrade.sql: $(SRCS)
-       $(CATSQL) structure/upgrade.sql > $@
-
-structure/newgrants_pgq_node.sql: structure/grants.ini
-       $(GRANTFU) -r -d -t $< > $@
-
-structure/oldgrants_pgq_node.sql: structure/grants.ini structure/grants.sql
-       echo "begin;" > $@
-       $(GRANTFU) -R -o $< >> $@
-       cat structure/grants.sql >> $@
-       echo "commit;" >> $@
-
-
 #
 # docs
 #
+
 dox: cleandox $(SRCS)
        mkdir -p docs/html
        mkdir -p docs/sql
@@ -59,8 +20,3 @@ dox: cleandox $(SRCS)
        $(CATSQL) --ndoc structure/functions.sql > docs/sql/functions.sql
        $(NDOC) $(NDOCARGS)
 
-cleandox:
-       rm -rf docs/html docs/Data docs/sql
-
-clean: cleandox
-