From 7f6cbad4a9b0f5416ff011a5c3fee90f697f0529 Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Wed, 14 Dec 2011 11:22:38 +0000 Subject: [PATCH] minor change to rtpostgis_drop so can more easily drop from extension for extension install. Many changes to extensions so can use native postgis upgarde and raster upgrade scripts. bump up version numbers git-svn-id: http://svn.osgeo.org/postgis/trunk@8404 b70326c6-7e19-0410-871a-916f4a2858ee --- extensions/postgis/Makefile | 34 +++++++++++++------ extensions/postgis/postgis.control | 2 +- .../sql_bits/remove_from_extension.sql.in | 2 +- extensions/postgis_topology/Makefile | 4 +-- .../postgis_topology/postgis_topology.control | 2 +- raster/rt_pg/rtpostgis_drop.sql.in.c | 2 +- 6 files changed, 30 insertions(+), 16 deletions(-) diff --git a/extensions/postgis/Makefile b/extensions/postgis/Makefile index 3ee7f5578..154ee6d01 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.0a3--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a6--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a7--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a8--$(EXTVERSION).sql +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 sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql cp $< $@ @@ -37,33 +37,47 @@ sql_bits/postgis_comments.sql: ../../doc/postgis_comments.sql 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 +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' \ + $< > $@ + #can't use the one built because can't drop the postgis_version function -#leave out all casts, operators, types, tables, schema, and aggregates -sql_bits/postgis_upgrade_minor.sql: ../../postgis/postgis.sql - sed -e '/^\(CREATE\|ALTER\) \(CAST\|OPERATOR\|TYPE\|TABLE\|SCHEMA\|DOMAIN\|TRIGGER\|AGGREGATE\).*;/d' \ - -e '/^\(CREATE\|ALTER\) \(CAST\|OPERATOR\|TYPE\|TABLE\|SCHEMA\|DOMAIN\|TRIGGER\|AGGREGATE\)/,/\;/d' \ - -e 's/BEGIN;//g' -e 's/COMMIT;//g' \ +#leave out all casts, operators, types, tables, schemas +# sql_bits/postgis_upgrade_minor.sql: ../../postgis/postgis.sql +# sed -e '/^\(CREATE\|ALTER\) \(CAST\|OPERATOR\|TYPE\|TABLE\|SCHEMA\|DOMAIN\|TRIGGER\).*;/d' \ +# -e '/^\(CREATE\|ALTER\) \(CAST\|OPERATOR\|TYPE\|TABLE\|SCHEMA\|DOMAIN\|TRIGGER\)/,/\;/d' \ +# -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 +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' \ + -e '/^\(DROP\|CREATE\) \(CAST\)/,/\;/d' \ + -e 's/DROP FUNCTION postgis_major_version_check();/ALTER EXTENSION ${EXTENSION} DROP FUNCTION postgis_major_version_check();DROP FUNCTION postgis_major_version_check();/g' \ $< > $@ sql_bits/raster_comments.sql: ../../doc/raster_comments.sql cp $< $@ -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 ../../raster/rt_pg/rtpostgis_upgrade_20_minor.sql ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.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.0a6--$(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 cp $< $@ +sql/$(EXTENSION)--2.0.0a9--$(EXTVERSION).sql: sql_bits/postgis_raster_upgrade_minor.sql + cp $< $@ + # sql_bits/rtpostgis--unpackaged.sql: ../../raster/rt_pg/rtpostgis.sql # sed -e 's/^[\t]*//' \ # -e :a -e '$!N; s/,\n/,/; ta' \ diff --git a/extensions/postgis/postgis.control b/extensions/postgis/postgis.control index 154c6beb1..602c08b05 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.0a9' +default_version = '2.0.0a10' module_pathname = '$libdir/postgis-2.0' relocatable = true diff --git a/extensions/postgis/sql_bits/remove_from_extension.sql.in b/extensions/postgis/sql_bits/remove_from_extension.sql.in index cd710eb19..a3819e94d 100644 --- a/extensions/postgis/sql_bits/remove_from_extension.sql.in +++ b/extensions/postgis/sql_bits/remove_from_extension.sql.in @@ -17,4 +17,4 @@ -- removes all postgis_topology functions from postgis_topology extension since they will be readded -- during upgrade SELECT postgis_extension_remove_objects('postgis', 'FUNCTION'); ---SELECT postgis_extension_remove_objects('postgis', 'AGGREGATE'); +SELECT postgis_extension_remove_objects('postgis', 'AGGREGATE'); diff --git a/extensions/postgis_topology/Makefile b/extensions/postgis_topology/Makefile index e85542a39..d245ac787 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.0a7--$(EXTVERSION).sql +all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a1--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a8--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql cp $< $@ @@ -61,7 +61,7 @@ sql/$(EXTENSION)--2.0.0a1--$(EXTVERSION).sql: ../postgis_extension_helper.sql sq sql/$(EXTENSION)--2.0.0a2--$(EXTVERSION).sql: sql/$(EXTENSION)--2.0.0a1--$(EXTVERSION).sql cp $< $@ -sql/$(EXTENSION)--2.0.0a7--$(EXTVERSION).sql: sql/$(EXTENSION)--2.0.0a1--$(EXTVERSION).sql +sql/$(EXTENSION)--2.0.0a8--$(EXTVERSION).sql: sql/$(EXTENSION)--2.0.0a1--$(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 6d70e0bc8..dc7e464d6 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.0a8' +default_version = '2.0.0a10' relocatable = false schema = topology requires = postgis diff --git a/raster/rt_pg/rtpostgis_drop.sql.in.c b/raster/rt_pg/rtpostgis_drop.sql.in.c index e546c3b42..9d8370c90 100644 --- a/raster/rt_pg/rtpostgis_drop.sql.in.c +++ b/raster/rt_pg/rtpostgis_drop.sql.in.c @@ -246,7 +246,7 @@ CREATE OR REPLACE FUNCTION _rename_raster_tables() END; $$ LANGUAGE 'plpgsql' VOLATILE; SELECT _rename_raster_tables(); -DROP FUNCTION IF EXISTS _rename_raster_tables(); +DROP FUNCTION _rename_raster_tables(); -- functions no longer supported DROP FUNCTION IF EXISTS AddRasterColumn(varchar, varchar, varchar, varchar, integer, varchar[], boolean, boolean, double precision[], double precision, double precision, integer, integer, geometry); -- 2.40.0