Bump ext ver to 2.5.0, add upgrade scripts

diff --git a/META.json b/META.json
index 8c1159e280d68461104709d47fd3ac8b899c0fe2..671db7d85a8f9e1cb6df2a579ac2dea1552fa34e 100644 (file)
--- a/META.json
+++ b/META.json
@@ -2,7 +2,7 @@
    "name": "plproxy",
    "abstract": "Database partitioning implemented as procedural language",
    "description": "PL/Proxy is database partitioning system implemented as PL language.",
-   "version": "2.4.0",
+   "version": "2.5.0",
    "maintainer": [
       "Marko Kreen <markokr@gmail.com>"
    ],
@@ -14,7 +14,7 @@
          "abstract": "Database partitioning implemented as procedural language",
          "file": "sql/plproxy.sql",
          "docfile": "doc/tutorial.txt",
-         "version": "2.4.0"
+         "version": "2.5.0"
       }
    },
    "prereqs": {

diff --git a/Makefile b/Makefile
index 87215890a20352df74308dcb189685bc09666f1d..3ccfe1ea7103f9fe98fe02547bd4d98609a8028c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
 EXTENSION  = plproxy
 
 # sync with NEWS, META.json, plproxy.control, debian/changelog
-DISTVERSION = 2.4
-EXTVERSION = 2.4.0
+DISTVERSION = 2.5
+EXTVERSION = 2.5.0
+UPGRADE_VERS = 2.3.0 2.4.0
 
 # set to 1 to disallow functions containing SELECT
 NO_SELECT = 0
@@ -45,9 +46,9 @@ override CONTRIB_TESTDB := regression
 # sql source
 PLPROXY_SQL = sql/plproxy_lang.sql
 # Generated SQL files
-EXTSQL = sql/$(EXTENSION)--$(EXTVERSION).sql
-# Fixed SQL
-EXTMISC = sql/plproxy--unpackaged--2.3.0.sql
+EXTSQL = sql/$(EXTENSION)--$(EXTVERSION).sql \
+       $(foreach v,$(UPGRADE_VERS),sql/plproxy--$(v)--$(EXTVERSION).sql) \
+       sql/plproxy--unpackaged--$(EXTVERSION).sql
 
 # PostgreSQL version
 PGVER = $(shell $(PG_CONFIG) --version | sed 's/PostgreSQL //')
@@ -102,11 +103,18 @@ sql/plproxy.sql: $(PLPROXY_SQL)
        cat $^ > $@
 
 # plain plproxy.sql is not installed, but used in tests
-$(EXTSQL): $(PLPROXY_SQL)
+sql/$(EXTENSION)--$(EXTVERSION).sql: $(PLPROXY_SQL)
        @mkdir -p sql
        echo "create extension plproxy;" > sql/plproxy.sql 
        cat $^ > $@
 
+$(foreach v,$(UPGRADE_VERS),sql/plproxy--$(v)--$(EXTVERSION).sql):
+       touch $@
+
+sql/plproxy--unpackaged--$(EXTVERSION).sql: sql/ext_unpackaged.sql
+       @mkdir -p sql
+       cat $< > $@
+
 # dependencies
 
 $(OBJS): $(HDRS)

diff --git a/plproxy.control b/plproxy.control
index 38389e0255f40dee2a337427001cccb197e1ef7a..64b12a3a9a2a19352c6175dca66393a05ed89f4a 100644 (file)
--- a/plproxy.control
+++ b/plproxy.control
@@ -1,6 +1,6 @@
 # plproxy extension
 comment = 'Database partitioning implemented as procedural language'
-default_version = '2.4.0'
+default_version = '2.5.0'
 module_pathname = '$libdir/plproxy'
 relocatable = false
 # schema = pg_catalog

diff --git a/sql/plproxy--unpackaged--2.3.0.sql b/sql/ext_unpackaged.sql
similarity index 100%
rename from sql/plproxy--unpackaged--2.3.0.sql
rename to sql/ext_unpackaged.sql