From: Regina Obe <lr@pcorp.us>
Date: Wed, 29 Jun 2011 16:26:06 +0000 (+0000)
Subject: #949 more legacy cleanup -- add G-M to uninstall, remove accum
X-Git-Tag: 2.0.0alpha1~1321
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62a5042f865813f82ba0011df654474c4984ec32;p=postgis

#949 more legacy cleanup -- add G-M to uninstall, remove accum

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

diff --git a/postgis/legacy.sql.in.c b/postgis/legacy.sql.in.c
index 4b1c55588..e4841e287 100644
--- a/postgis/legacy.sql.in.c
+++ b/postgis/legacy.sql.in.c
@@ -129,7 +129,9 @@ CREATE OR REPLACE FUNCTION st_geometry(box3d_extent)
 	LANGUAGE 'C' IMMUTABLE STRICT;
 	
 -- Deprecation in 1.5.0
-CREATE OR REPLACE FUNCTION st_geometry_analyze(internal)
+-- these remarked out functions cause problems and no one uses them directly
+-- They should not be installed
+/** CREATE OR REPLACE FUNCTION st_geometry_analyze(internal)
 	RETURNS bool
 #ifdef GSERIALIZED_ON
 	AS 'MODULE_PATHNAME', 'geometry_analyze'
@@ -174,7 +176,7 @@ CREATE OR REPLACE FUNCTION st_spheroid_out(spheroid)
 	AS 'MODULE_PATHNAME','ellipsoid_out'
 	LANGUAGE 'C' IMMUTABLE STRICT;
 	
-
+**/
 -- Deprecation in 1.5.0
 CREATE OR REPLACE FUNCTION st_geometry_lt(geometry, geometry)
 	RETURNS bool
@@ -1799,6 +1801,13 @@ CREATE OR REPLACE FUNCTION zmflag(geometry)
 -- end old ogc names that have been replaced with new SQL-MM names --
 
 --- Start Aggregates and supporting functions --
+-- Deprecation in: 1.2.3
+CREATE AGGREGATE accum (
+	sfunc = pgis_geometry_accum_transfn,
+	basetype = geometry,
+	stype = pgis_abs,
+	finalfunc = pgis_geometry_accum_finalfn
+	);
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION collect(geometry, geometry)
 	RETURNS geometry
diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index 0892d6ffc..04f1a8f59 100644
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -3451,14 +3451,6 @@ CREATE OR REPLACE FUNCTION pgis_geometry_makeline_finalfn(pgis_abs)
 	AS 'MODULE_PATHNAME'
 	LANGUAGE 'C';
 
--- Deprecation in: 1.2.3
-CREATE AGGREGATE accum (
-	sfunc = pgis_geometry_accum_transfn,
-	basetype = geometry,
-	stype = pgis_abs,
-	finalfunc = pgis_geometry_accum_finalfn
-	);
-
 -- Availability: 1.2.2
 CREATE AGGREGATE ST_Accum (
 	sfunc = pgis_geometry_accum_transfn,
@@ -5026,7 +5018,7 @@ $BODY$
 		END LOOP;
 
 	-- We now have the diameter of the convex hull.  The following line returns it if desired.
-	-- RETURN MakeLine(PointN(ring,idx1),PointN(ring,idx2));
+	-- RETURN ST_MakeLine(ST_PointN(ring,idx1),ST_PointN(ring,idx2));
 
 	-- Now for the Minimum Bounding Circle.  Since we know the two points furthest from each
 	-- other, the MBC must go through those two points. Start with those points as a diameter of a circle.
diff --git a/postgis/uninstall_legacy.sql.in.c b/postgis/uninstall_legacy.sql.in.c
index a328b8903..506d91f32 100644
--- a/postgis/uninstall_legacy.sql.in.c
+++ b/postgis/uninstall_legacy.sql.in.c
@@ -17,6 +17,7 @@ DROP FUNCTION IF EXISTS Translate(geometry,float8,float8);
 DROP FUNCTION IF EXISTS TransScale(geometry,float8,float8,float8,float8);
 
 -- Other functions --
+DROP AGGREGATE IF EXISTS Accum(geometry);
 DROP FUNCTION IF EXISTS AddBBox(geometry);
 DROP FUNCTION IF EXISTS AddPoint(geometry,geometry);
 DROP FUNCTION IF EXISTS AddPoint(geometry,geometry, integer);
@@ -70,6 +71,7 @@ DROP AGGREGATE IF EXISTS Extent(geometry);
 DROP FUNCTION IF EXISTS Find_Extent(text,text);
 DROP FUNCTION IF EXISTS Find_Extent(text,text,text);
 --- End Extent related functions --
+
 DROP FUNCTION IF EXISTS EndPoint(geometry);
 DROP FUNCTION IF EXISTS ExteriorRing(geometry);
 DROP FUNCTION IF EXISTS Force_2d(geometry);
@@ -79,6 +81,29 @@ DROP FUNCTION IF EXISTS Force_3dz(geometry);
 DROP FUNCTION IF EXISTS Force_4d(geometry);
 DROP FUNCTION IF EXISTS Force_Collection(geometry);
 DROP FUNCTION IF EXISTS ForceRHR(geometry);
+DROP FUNCTION IF EXISTS GeomCollFromText(text, int4);
+DROP FUNCTION IF EXISTS GeomCollFromText(text);
+DROP FUNCTION IF EXISTS GeomCollFromWKB(bytea, int);
+DROP FUNCTION IF EXISTS GeomCollFromWKB(bytea);
+DROP FUNCTION IF EXISTS GeometryN(geometry,integer);
+DROP FUNCTION IF EXISTS GeomUnion(geometry,geometry);
+DROP FUNCTION IF EXISTS getbbox(geometry);
+DROP FUNCTION IF EXISTS Intersects(geometry,geometry);
+DROP FUNCTION IF EXISTS IsRing(geometry);
+DROP FUNCTION IF EXISTS IsSimple(geometry);
+DROP FUNCTION IF EXISTS length_spheroid(geometry, spheroid);
+DROP FUNCTION IF EXISTS length2d_spheroid(geometry, spheroid);
+DROP FUNCTION IF EXISTS length3d_spheroid(geometry, spheroid);
+DROP FUNCTION IF EXISTS LineMerge(geometry);
+DROP FUNCTION IF EXISTS locate_along_measure(geometry, float8);
+DROP FUNCTION IF EXISTS MakeBox2d(geometry, geometry);
+DROP AGGREGATE IF EXISTS MakeLine(geometry);
+DROP FUNCTION IF EXISTS MakeLine(geometry, geometry);
+DROP FUNCTION IF EXISTS MakePolygon(geometry, geometry[]);
+DROP FUNCTION IF EXISTS MakePolygon(geometry);
+DROP FUNCTION IF EXISTS MPolyFromWKB(bytea);
+DROP FUNCTION IF EXISTS multi(geometry);
+
 DROP FUNCTION IF EXISTS SnapToGrid(geometry, float8, float8, float8, float8);
 DROP FUNCTION IF EXISTS SnapToGrid(geometry, float8);
 DROP FUNCTION IF EXISTS SnapToGrid(geometry, geometry, float8, float8, float8, float8);