From: Regina Obe Date: Mon, 19 Dec 2011 06:33:13 +0000 (+0000) Subject: bump up numbers. logic to drop raster casts from extension if they are present and... X-Git-Tag: 2.0.0alpha1~408 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c6a27c685148cae8a3d0bf4af4a891c27e30653;p=postgis bump up numbers. logic to drop raster casts from extension if they are present and script asks to drop. git-svn-id: http://svn.osgeo.org/postgis/trunk@8466 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/extensions/postgis/Makefile b/extensions/postgis/Makefile index 154ee6d01..03394130b 100644 --- a/extensions/postgis/Makefile +++ b/extensions/postgis/Makefile @@ -15,7 +15,7 @@ EXTRA_CLEAN += sql/$(EXTENSION).sql ${SQL_BITS} ifeq ($(PG91),yes) sql/$(EXTENSION).sql: sql_bits/postgis.sql sql_bits/postgis_comments.sql sql_bits/rtpostgis.sql sql_bits/raster_comments.sql sql_bits/spatial_ref_sys.sql cat $^ > $@ -all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a7--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a8--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a9--$(EXTVERSION).sql +all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a9--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a10--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql cp $< $@ @@ -38,9 +38,14 @@ sql_bits/rtpostgis.sql: ../../raster/rt_pg/rtpostgis.sql sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' $< > $@ # we need to also drop this temporary function from the extension +# for casts that are being dropped we need to drop them +# from extension only if they are in the existension so we use our postgis_extension_drop.. +# so that it will silently fail if cast is not in extension sql_bits/rtpostgis_upgrade_20_minor.sql: ../../raster/rt_pg/rtpostgis_upgrade_20_minor.sql sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' \ -e 's/DROP FUNCTION _rename_raster_tables();/ALTER EXTENSION ${EXTENSION} DROP FUNCTION _rename_raster_tables();DROP FUNCTION _rename_raster_tables();/g' \ + -e 's/DROP FUNCTION _drop_st_samealignment();/ALTER EXTENSION ${EXTENSION} DROP FUNCTION _drop_st_samealignment();DROP FUNCTION _drop_st_samealignment();/g' \ + -e 's/DROP CAST\(.*\)/SELECT postgis_extension_drop_if_exists('\''$(EXTENSION)'\'', '\''DROP CAST \1'\'');DROP CAST \1/' \ $< > $@ #can't use the one built because can't drop the postgis_version function @@ -51,7 +56,7 @@ sql_bits/rtpostgis_upgrade_20_minor.sql: ../../raster/rt_pg/rtpostgis_upgrade_20 # -e 's/BEGIN;//g' -e 's/COMMIT;//g' \ # $< > $@ #don't drop casts just yet since we don't have provision to remove from extension yet -#need to also drop temeporary function from extenions since it gets auto-added +#need to also drop temeporary functions from extenions since it gets auto-added sql_bits/postgis_upgrade_minor.sql: ../../postgis/postgis_upgrade_20_minor.sql sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' \ -e '/^\(DROP\|CREATE\) \(CAST\).*;/d' \ @@ -66,16 +71,13 @@ sql_bits/raster_comments.sql: ../../doc/raster_comments.sql sql_bits/postgis_raster_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in ../../postgis/postgis_drop_before.sql.in.c sql_bits/postgis_upgrade_minor.sql sql_bits/rtpostgis_upgrade_20_minor.sql ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.sql cat $^ > $@ -sql/$(EXTENSION)--2.0.0a3--$(EXTVERSION).sql: sql_bits/postgis_raster_upgrade_minor.sql - cp $< $@ - sql/$(EXTENSION)--2.0.0a7--$(EXTVERSION).sql: sql_bits/postgis_raster_upgrade_minor.sql cp $< $@ -sql/$(EXTENSION)--2.0.0a8--$(EXTVERSION).sql: sql_bits/postgis_raster_upgrade_minor.sql +sql/$(EXTENSION)--2.0.0a9--$(EXTVERSION).sql: sql_bits/postgis_raster_upgrade_minor.sql cp $< $@ -sql/$(EXTENSION)--2.0.0a9--$(EXTVERSION).sql: sql_bits/postgis_raster_upgrade_minor.sql +sql/$(EXTENSION)--2.0.0a10--$(EXTVERSION).sql: sql_bits/postgis_raster_upgrade_minor.sql cp $< $@ # sql_bits/rtpostgis--unpackaged.sql: ../../raster/rt_pg/rtpostgis.sql diff --git a/extensions/postgis/postgis.control b/extensions/postgis/postgis.control index 602c08b05..f0d866694 100644 --- a/extensions/postgis/postgis.control +++ b/extensions/postgis/postgis.control @@ -1,5 +1,5 @@ # postgis extension comment = 'postgis geometry,geography, and raster spatial types and functions' -default_version = '2.0.0a10' +default_version = '2.0.0a11' module_pathname = '$libdir/postgis-2.0' relocatable = true diff --git a/extensions/postgis_extension_helper.sql b/extensions/postgis_extension_helper.sql index ab5e04c95..48a04f455 100644 --- a/extensions/postgis_extension_helper.sql +++ b/extensions/postgis_extension_helper.sql @@ -60,3 +60,23 @@ BEGIN END; $$ LANGUAGE plpgsql VOLATILE; + +CREATE OR REPLACE FUNCTION postgis_extension_drop_if_exists(param_extension text, param_statement text) + RETURNS boolean AS +$$ +DECLARE + var_sql_ext text := 'ALTER EXTENSION ' || quote_ident(param_extension) || ' ' || replace(param_statement, 'IF EXISTS', ''); + var_result boolean := false; +BEGIN + BEGIN + EXECUTE var_sql_ext; + var_result := true; + EXCEPTION + WHEN OTHERS THEN + --this is to allow ignoring if the object does not exist in extension + var_result := false; + END; + RETURN var_result; +END; +$$ +LANGUAGE plpgsql VOLATILE; diff --git a/extensions/postgis_extension_helper_uninstall.sql b/extensions/postgis_extension_helper_uninstall.sql index 5ef03228a..619f71a78 100644 --- a/extensions/postgis_extension_helper_uninstall.sql +++ b/extensions/postgis_extension_helper_uninstall.sql @@ -15,3 +15,4 @@ -- This drops extension helper functions -- and should be called at the end of the extension upgrade file DROP FUNCTION postgis_extension_remove_objects(text, text); +DROP FUNCTION postgis_extension_drop_if_exists(text, text) diff --git a/extensions/postgis_topology/Makefile b/extensions/postgis_topology/Makefile index d245ac787..f04b4dde9 100644 --- a/extensions/postgis_topology/Makefile +++ b/extensions/postgis_topology/Makefile @@ -11,7 +11,7 @@ EXTRA_CLEAN += sql/*.sql ${SQL_BITS} ifeq ($(PG91),yes) -all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a1--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a8--$(EXTVERSION).sql +all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a10--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql cp $< $@ @@ -55,13 +55,10 @@ sql/topology_upgrade_minor.sql: sql_bits/topology.sql -e '/^\(CREATE\|ALTER\) \(CAST\|TYPE\|TABLE\|SCHEMA\|DOMAIN\|TRIGGER\)/,/\;/d' \ $< > $@ -sql/$(EXTENSION)--2.0.0a1--$(EXTVERSION).sql: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/topology_upgrade_minor.sql sql_bits/topology_comments.sql ../postgis_extension_helper_uninstall.sql +sql/$(EXTENSION)--2.0.0a9--$(EXTVERSION).sql: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/topology_upgrade_minor.sql sql_bits/topology_comments.sql ../postgis_extension_helper_uninstall.sql cat $^ > $@ - -sql/$(EXTENSION)--2.0.0a2--$(EXTVERSION).sql: sql/$(EXTENSION)--2.0.0a1--$(EXTVERSION).sql - cp $< $@ - -sql/$(EXTENSION)--2.0.0a8--$(EXTVERSION).sql: sql/$(EXTENSION)--2.0.0a1--$(EXTVERSION).sql + +sql/$(EXTENSION)--2.0.0a10--$(EXTVERSION).sql: sql/$(EXTENSION)--2.0.0a9--$(EXTVERSION).sql cp $< $@ DATA = $(wildcard sql/*--*.sql) sql/$(EXTENSION)--$(EXTVERSION).sql diff --git a/extensions/postgis_topology/postgis_topology.control b/extensions/postgis_topology/postgis_topology.control index dc7e464d6..5e442cb28 100644 --- a/extensions/postgis_topology/postgis_topology.control +++ b/extensions/postgis_topology/postgis_topology.control @@ -1,6 +1,6 @@ # postgis topology extension comment = 'postgis topology spatial types and functions' -default_version = '2.0.0a10' +default_version = '2.0.0a11' relocatable = false schema = topology requires = postgis