[postgis-tickets] r14634 - Wrap every DROP to first unregister object from postgis extension

[Sandro Santilli]

Author: strk
Date: 2016-02-09 01:01:00 -0800 (Tue, 09 Feb 2016)
New Revision: 14634

Modified:
   tags/2.2.0/extensions/postgis/Makefile.in
Log:
Wrap every DROP to first unregister object from postgis extension

Also drop temporarely introduced ST_AsTWKB signature.
See #3450

Modified: tags/2.2.0/extensions/postgis/Makefile.in
===================================================================
--- tags/2.2.0/extensions/postgis/Makefile.in	2016-02-09 09:00:53 UTC (rev 14633)
+++ tags/2.2.0/extensions/postgis/Makefile.in	2016-02-09 09:01:00 UTC (rev 14634)
@@ -74,25 +74,15 @@
 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.sql: ../../raster/rt_pg/rtpostgis_upgrade.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/' \
+	    -e "s/^\(DROP .*\);/SELECT postgis_extension_drop_if_exists('${EXTENSION}', '\1');\n\1;/" \
 	$< > $@
 
-#don't drop casts just yet since we don't have provision to remove from extension yet
-#need to also drop temporary functions from extenions since it gets auto-added
 sql_bits/postgis_upgrade.sql: ../../postgis/postgis_upgrade.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' \
-	 	 $< > $@
+	sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' \
+	    -e "s/^\(DROP .*\);/SELECT postgis_extension_drop_if_exists('${EXTENSION}', '\1');\n\1;/" \
+	$< > $@
 
 
 ../../doc/raster_comments.sql: