minor change to rtpostgis_drop so can more easily drop from extension for extension...

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

diff --git a/extensions/postgis/Makefile b/extensions/postgis/Makefile
index 3ee7f55783fe48d512fb0f119071df3b6214dc3e..154ee6d01786272bcb6597d08f2e18f4adadc945 100644 (file)
--- 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 154c6beb1d26f4a62407d89e2123be517e325027..602c08b0593cf054096c7212492cc8af50871ffa 100644 (file)
--- 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 cd710eb19db62c59d7a4a4d3fc0160b005789260..a3819e94d7b959147661694ee58e7cb477eae54f 100644 (file)
--- 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 e85542a390eb6b456a2e9c14b92a025990067cc1..d245ac7878bce61ab4ea30b9246666af7c1dadc8 100644 (file)
--- 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 6d70e0bc877f7823337f40c39ebfe78e518d6e45..dc7e464d6f1be98c6ae6302c3e865ef55834e199 100644 (file)
--- 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 e546c3b42b44c4bcf4c3ae3ea55d371e623932d0..9d8370c9046436b281f54eed31a2575a82627967 100644 (file)
--- 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);