[postgis-tickets] r14629 - Unregister all functions before starting postgis extention upgrade

[Sandro Santilli]

Author: strk
Date: 2016-02-08 08:54:36 -0800 (Mon, 08 Feb 2016)
New Revision: 14629

Removed:
   trunk/extensions/postgis/sql_bits/remove_from_extension.sql.in
Modified:
   trunk/extensions/postgis/Makefile.in
   trunk/postgis/postgis_drop_after.sql
Log:
Unregister all functions before starting postgis extention upgrade

Also drop temporarely introduced ST_AsTWKB signature.
See #3450

Modified: trunk/extensions/postgis/Makefile.in
===================================================================
--- trunk/extensions/postgis/Makefile.in	2016-02-07 05:50:55 UTC (rev 14628)
+++ trunk/extensions/postgis/Makefile.in	2016-02-08 16:54:36 UTC (rev 14629)
@@ -100,10 +100,14 @@
 sql_bits/raster_comments.sql: ../../doc/raster_comments.sql
 	cp $< $@
 
+sql_bits/postgis_extension_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/postgis_upgrade.sql sql_bits/rtpostgis_upgrade.sql ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.sql
 #postgis_extension_upgrade_minor.sql is the one that contains both postgis AND raster
-#TODO: what about postgis_drop_after.sql ? where does it fit ??
 sql_bits/postgis_extension_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/postgis_upgrade.sql sql_bits/rtpostgis_upgrade.sql ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.sql
 	echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@
+	# NOTE: good functions are always re-added by the upgrade scripts,
+	#       so unregistering them all here ensures the removed ones
+	#       can be removed on upgrade.
+	echo "SELECT postgis_extension_remove_objects('postgis', 'FUNCTION');" >> $@
 	cat $^ >> $@
 
 sql_minor_upgrade: sql_bits/postgis_extension_upgrade_minor.sql

Deleted: trunk/extensions/postgis/sql_bits/remove_from_extension.sql.in
===================================================================
--- trunk/extensions/postgis/sql_bits/remove_from_extension.sql.in	2016-02-07 05:50:55 UTC (rev 14628)
+++ trunk/extensions/postgis/sql_bits/remove_from_extension.sql.in	2016-02-08 16:54:36 UTC (rev 14629)
@@ -1,29 +0,0 @@
--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- 
-----
--- PostGIS - Spatial Types for PostgreSQL
--- http://postgis.net
---
--- Copyright (C) 2011 Regina Obe <lr at pcorp.us>
---
--- This is free software; you can redistribute and/or modify it under
--- the terms of the GNU General Public Licence. See the COPYING file.
---
--- Author: Regina Obe <lr at pcorp.us>
---  
--- This drops extension helper functions
--- and should be called at the end of the extension upgrade file
--- 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_drop_if_exists('postgis', 'DROP VIEW raster_columns');
-SELECT postgis_extension_drop_if_exists('postgis', 'DROP TYPE wktgeomval');
-SELECT postgis_extension_drop_if_exists('postgis', 'DROP TYPE _wktgeomval');
-SELECT postgis_extension_drop_if_exists('postgis', 'DROP TYPE raster_columns');
-SELECT postgis_extension_drop_if_exists('postgis', 'DROP TYPE _raster_columns');
--- these got changed to out paramters in 2.1
-SELECT postgis_extension_drop_if_exists('postgis', 'DROP TYPE summarystats');
-SELECT postgis_extension_drop_if_exists('postgis', 'DROP TYPE quantile');
-SELECT postgis_extension_drop_if_exists('postgis', 'DROP TYPE valuecount');
-SELECT postgis_extension_drop_if_exists('postgis', 'DROP TYPE histogram');

Modified: trunk/postgis/postgis_drop_after.sql
===================================================================
--- trunk/postgis/postgis_drop_after.sql	2016-02-07 05:50:55 UTC (rev 14628)
+++ trunk/postgis/postgis_drop_after.sql	2016-02-08 16:54:36 UTC (rev 14629)
@@ -147,3 +147,4 @@
 DROP FUNCTION IF EXISTS ST_AsBinary(text); -- deprecated in 2.0
 DROP FUNCTION IF EXISTS postgis_uses_stats(); -- deprecated in 2.0
 
+DROP FUNCTION IF EXISTS st_astwkb(geometry,integer,bigint,bool,bool); -- temporarely introduced before 2.2.0 final