#949 Add all E and F deprecated functions to uninstall_legacy.sql.in.c and minor...

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

diff --git a/postgis/legacy.sql.in.c b/postgis/legacy.sql.in.c
index e07b2cf4e12c2d5de5b8ad6b2d4b410419d5ca81..6fb67d12fc8e4487402e821db47f0326a4072c61 100644 (file)
--- a/postgis/legacy.sql.in.c
+++ b/postgis/legacy.sql.in.c
@@ -680,13 +680,13 @@ CREATE OR REPLACE FUNCTION DumpRings(geometry)
        LANGUAGE 'C' IMMUTABLE STRICT;
 
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION envelope(geometry)
+CREATE OR REPLACE FUNCTION Envelope(geometry)
        RETURNS geometry
        AS 'MODULE_PATHNAME', 'LWGEOM_envelope'
        LANGUAGE 'C' IMMUTABLE STRICT;
        
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION estimated_extent(text,text,text) RETURNS box2d AS
+CREATE OR REPLACE FUNCTION Estimated_Extent(text,text,text) RETURNS box2d AS
 #ifdef GSERIALIZED_ON
        'MODULE_PATHNAME', 'geometry_estimated_extent'
 #else
@@ -695,7 +695,7 @@ CREATE OR REPLACE FUNCTION estimated_extent(text,text,text) RETURNS box2d AS
        LANGUAGE 'C' IMMUTABLE STRICT SECURITY DEFINER;
        
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION estimated_extent(text,text) RETURNS box2d AS
+CREATE OR REPLACE FUNCTION Estimated_Extent(text,text) RETURNS box2d AS
 #ifdef GSERIALIZED_ON
        'MODULE_PATHNAME', 'geometry_estimated_extent'
 #else
@@ -704,26 +704,26 @@ CREATE OR REPLACE FUNCTION estimated_extent(text,text) RETURNS box2d AS
        LANGUAGE 'C' IMMUTABLE STRICT SECURITY DEFINER;
        
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION expand(box2d,float8)
+CREATE OR REPLACE FUNCTION Expand(box2d,float8)
        RETURNS box2d
        AS 'MODULE_PATHNAME', 'BOX2DFLOAT4_expand'
        LANGUAGE 'C' IMMUTABLE STRICT;
        
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION expand(box3d,float8)
+CREATE OR REPLACE FUNCTION Expand(box3d,float8)
        RETURNS box3d
        AS 'MODULE_PATHNAME', 'BOX3D_expand'
        LANGUAGE 'C' IMMUTABLE STRICT;
        
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION expand(geometry,float8)
+CREATE OR REPLACE FUNCTION Expand(geometry,float8)
        RETURNS geometry
        AS 'MODULE_PATHNAME', 'LWGEOM_expand'
        LANGUAGE 'C' IMMUTABLE STRICT;
        
 -- Deprecation in 1.2.3
 -- Temporary hack function
-CREATE OR REPLACE FUNCTION combine_bbox(box3d_extent,geometry)
+CREATE OR REPLACE FUNCTION Combine_Bbox(box3d_extent,geometry)
        RETURNS box3d_extent
        AS 'MODULE_PATHNAME', 'BOX3D_combine'
        LANGUAGE 'C' IMMUTABLE;
@@ -735,7 +735,7 @@ CREATE AGGREGATE Extent(
        );
        
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION find_extent(text,text) RETURNS box2d AS
+CREATE OR REPLACE FUNCTION Find_Extent(text,text) RETURNS box2d AS
 $$
 DECLARE
        tablename alias for $1;
@@ -751,7 +751,7 @@ $$
 LANGUAGE 'plpgsql' IMMUTABLE STRICT;
 
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION find_extent(text,text,text) RETURNS box2d AS
+CREATE OR REPLACE FUNCTION Find_Extent(text,text,text) RETURNS box2d AS
 $$
 DECLARE
        schemaname alias for $1;
@@ -780,39 +780,39 @@ CREATE OR REPLACE FUNCTION ExteriorRing(geometry)
        LANGUAGE 'C' IMMUTABLE STRICT;
        
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION force_2d(geometry)
+CREATE OR REPLACE FUNCTION Force_2d(geometry)
        RETURNS geometry
        AS 'MODULE_PATHNAME', 'LWGEOM_force_2d'
        LANGUAGE 'C' IMMUTABLE STRICT;
        
 -- an alias for force_3dz
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION force_3d(geometry)
+CREATE OR REPLACE FUNCTION Force_3d(geometry)
        RETURNS geometry
        AS 'MODULE_PATHNAME', 'LWGEOM_force_3dz'
        LANGUAGE 'C' IMMUTABLE STRICT;
        
 
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION force_3dm(geometry)
+CREATE OR REPLACE FUNCTION Force_3dm(geometry)
        RETURNS geometry
        AS 'MODULE_PATHNAME', 'LWGEOM_force_3dm'
        LANGUAGE 'C' IMMUTABLE STRICT;
        
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION force_3dz(geometry)
+CREATE OR REPLACE FUNCTION Force_3dz(geometry)
        RETURNS geometry
        AS 'MODULE_PATHNAME', 'LWGEOM_force_3dz'
        LANGUAGE 'C' IMMUTABLE STRICT;
        
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION force_4d(geometry)
+CREATE OR REPLACE FUNCTION Force_4d(geometry)
        RETURNS geometry
        AS 'MODULE_PATHNAME', 'LWGEOM_force_4d'
        LANGUAGE 'C' IMMUTABLE STRICT;
        
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION force_collection(geometry)
+CREATE OR REPLACE FUNCTION Force_Collection(geometry)
        RETURNS geometry
        AS 'MODULE_PATHNAME', 'LWGEOM_force_collection'
        LANGUAGE 'C' IMMUTABLE STRICT;

diff --git a/postgis/uninstall_legacy.sql.in.c b/postgis/uninstall_legacy.sql.in.c
index 3cf8a42a77d95b7490d9b6ca37d7e121aba9ef05..0d83376fdd83be959f268302dc0cca89ebe5eacb 100644 (file)
--- a/postgis/uninstall_legacy.sql.in.c
+++ b/postgis/uninstall_legacy.sql.in.c
@@ -46,6 +46,7 @@ DROP FUNCTION IF EXISTS Buffer(geometry,float8,integer);
 DROP FUNCTION IF EXISTS Buffer(geometry,float8);
 DROP FUNCTION IF EXISTS BuildArea(geometry);
 DROP FUNCTION IF EXISTS Centroid(geometry);
+DROP FUNCTION IF EXISTS Combine_Bbox(box3d_extent,geometry);
 DROP FUNCTION IF EXISTS Contains(geometry,geometry);
 DROP FUNCTION IF EXISTS ConvexHull(geometry);
 DROP FUNCTION IF EXISTS Crosses(geometry,geometry);
@@ -58,3 +59,24 @@ DROP FUNCTION IF EXISTS Distance_Spheroid(geometry,geometry,spheroid);
 DROP FUNCTION IF EXISTS DropBBox(geometry);
 DROP FUNCTION IF EXISTS Dump(geometry);
 DROP FUNCTION IF EXISTS DumpRings(geometry);
+DROP FUNCTION IF EXISTS Envelope(geometry);
+-- Extent related functions  --
+DROP FUNCTION IF EXISTS Estimated_Extent(text,text,text);
+DROP FUNCTION IF EXISTS Estimated_Extent(text,text);
+DROP FUNCTION IF EXISTS Expand(box2d,float8);
+DROP FUNCTION IF EXISTS Expand(box3d,float8);
+DROP FUNCTION IF EXISTS Expand(geometry,float8);
+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);
+DROP FUNCTION IF EXISTS Force_3d(geometry);
+DROP FUNCTION IF EXISTS Force_3dm(geometry);
+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);
+