[topology] properly drop removed internal functions on upgrade

References #4202 in 2.5 branch

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

diff --git a/NEWS b/NEWS
index 94e16ff7d95c8810c8ed4299da5c574c36e3c50e..b8a038c61750d4432e5be70ef67f972ba90aa211 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ XXXX/XX/XX
   - #4188, Avoid division by zero in kmeans (Raúl Marín)
   - #4189, Fix undefined behaviour in SADFWrite (Raúl Marín)
   - #4191, Fix undefined behaviour in ptarray_clone_deep (Raúl Marín)
+  - #4020, Fix leftovers in topology upgrade from 2.1 (Sandro Santilli)
 
 
 PostGIS 2.5.0

diff --git a/topology/topology_drop_before.sql.in b/topology/topology_drop_before.sql.in
index f06187745f1543f50a5bf83f303268456b974b9f..2d917386787d5a1852f5161186dd4ade54fca71a 100644 (file)
--- a/topology/topology_drop_before.sql.in
+++ b/topology/topology_drop_before.sql.in
@@ -17,3 +17,6 @@ DROP FUNCTION IF EXISTS topology.toTopoGeom(Geometry, varchar, int, float8);
 -- used to be in public, will now be moved to topology
 DROP FUNCTION IF EXISTS postgis_topology_scripts_installed();
 
+-- Removed in 2.2.0 when topology API moved to liblwgeom
+DROP FUNCTION topology._ST_RemEdgeCheck(varchar, integer, integer, integer, integer);
+DROP FUNCTION topology._ST_AddFaceSplit(varchar, integer, integer, boolean);