Include upgrade in raster extension create from unpackaged

git-svn-id: http://svn.osgeo.org/postgis/trunk@16748 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index f7a36baea15f07eb36b7643beb4819149570ba45..88f6a6fb9d83c42a4f6b2e5face81888c4d613cc 100644 (file)
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -103,11 +103,6 @@ sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: $(EXTENSION_UNPACKAGED_UPGRADE_
                | $(PERL) ../../utils/create_unpackaged.pl postgis \
                >> $@
 
-unpackaged_check.sql: unpackaged_check.sql.in Makefile
-       cat $< \
-               | sed -e 's|@EXTVERSION@|$(EXTVERSION)|g' \
-               > $@
-
 sql:
        mkdir -p $@
 

diff --git a/extensions/postgis_raster/Makefile.in b/extensions/postgis_raster/Makefile.in
index 8d3274429f312259154a97d6f6afabd954aaf494..2de898209e5d0f86041603c5ca87b43ad8812e54 100644 (file)
--- a/extensions/postgis_raster/Makefile.in
+++ b/extensions/postgis_raster/Makefile.in
@@ -75,8 +75,9 @@ $(EXTENSION).control: $(EXTENSION).control.in Makefile
 sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql | sql
        cp $< $@
 
-sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: $(EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS) ../../utils/create_unpackaged.pl unpackaged_check.sql Makefile | sql
-       cat unpackaged_check.sql > $@
+sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: $(EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS) ../../utils/create_unpackaged.pl sql/$(EXTENSION)--ANY--$(EXTVERSION).sql Makefile | sql
+       # Ensure version is correct
+       cat sql/$(EXTENSION)--ANY--$(EXTVERSION).sql > $@
        cat $(EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS) | $(PERL) ../../utils/create_unpackaged.pl postgis_raster >> $@
 
 unpackaged_check.sql: unpackaged_check.sql.in Makefile
@@ -97,9 +98,9 @@ sql/rtpostgis_upgrade.sql: ../../raster/rt_pg/rtpostgis_upgrade_for_extension.sq
 sql/raster_comments.sql: ../../doc/raster_comments.sql | sql
        cp $< $@
 
-sql/postgis_extension_upgrade_minor.sql: $(EXTENSION_UPGRADE_SCRIPTS) | sql
+sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: $(EXTENSION_UPGRADE_SCRIPTS) | sql
        printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
-       cat $^ >> $@
+       cat $(EXTENSION_UPGRADE_SCRIPTS) >> $@
 
 EXTDIR=$(DESTDIR)$(datadir)/$(datamoduledir)
 
@@ -107,7 +108,7 @@ install: install-upgrade-paths
 
 # The "next" lines are a cludge to allow upgrading between different
 # revisions of the same version
-install-upgrade-paths: sql/postgis_extension_upgrade_minor.sql
+install-upgrade-paths:
        tpl='$(EXTENSION)--ANY--$(EXTVERSION).sql'; \
        $(INSTALL_DATA) $^ "$(EXTDIR)/$${tpl}"; \
        ln -fs "$${tpl}" $(EXTDIR)/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql; \

diff --git a/extensions/postgis_raster/unpackaged_check.sql.in b/extensions/postgis_raster/unpackaged_check.sql.in
deleted file mode 100644 (file)
index 63433e1..0000000
--- a/extensions/postgis_raster/unpackaged_check.sql.in
+++ /dev/null
@@ -1,14 +0,0 @@
-DO $$
-DECLARE
-       ver TEXT;
-BEGIN
-       ver := split_part(postgis_raster_scripts_installed(), ' ', 1);
-       IF ver != '@EXTVERSION@' THEN
-               RAISE EXCEPTION 'Installed PostGIS Raster version is %', ver
-               USING HINT = 'Try `CREATE EXTENSION postgis_raster VERSION '''
-                       || ver || ''' from unpackaged`,'
-                       ' or source rtpostgis_upgrade.sql`';
-       END IF;
-END;
-$$ LANGUAGE 'plpgsql';
-