#722 More deprecated functions: Get rid Extent deprecated aggregate, find_extent...

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

diff --git a/postgis/legacy.sql.in.c b/postgis/legacy.sql.in.c
index fee6ecc33d2a99802cd1c057a1f2a26a4874b73c..e774d9399d97c229eb699d168c8649b6032f6433 100644 (file)
--- a/postgis/legacy.sql.in.c
+++ b/postgis/legacy.sql.in.c
@@ -653,6 +653,24 @@ CREATE OR REPLACE FUNCTION envelope(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
+#ifdef GSERIALIZED_ON
+       'MODULE_PATHNAME', 'geometry_estimated_extent'
+#else
+       'MODULE_PATHNAME', 'LWGEOM_estimated_extent'
+#endif
+       LANGUAGE 'C' IMMUTABLE STRICT SECURITY DEFINER;
+       
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION estimated_extent(text,text) RETURNS box2d AS
+#ifdef GSERIALIZED_ON
+       'MODULE_PATHNAME', 'geometry_estimated_extent'
+#else
+       'MODULE_PATHNAME', 'LWGEOM_estimated_extent'
+#endif
+       LANGUAGE 'C' IMMUTABLE STRICT SECURITY DEFINER;
+       
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION expand(box2d,float8)
        RETURNS box2d
@@ -671,6 +689,58 @@ CREATE OR REPLACE FUNCTION expand(geometry,float8)
        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)
+       RETURNS box3d_extent
+       AS 'MODULE_PATHNAME', 'BOX3D_combine'
+       LANGUAGE 'C' IMMUTABLE;
+       
+CREATE AGGREGATE Extent(
+       sfunc = ST_combine_bbox,
+       basetype = geometry,
+       stype = box3d_extent
+       );
+       
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION find_extent(text,text) RETURNS box2d AS
+$$
+DECLARE
+       tablename alias for $1;
+       columnname alias for $2;
+       myrec RECORD;
+
+BEGIN
+       FOR myrec IN EXECUTE 'SELECT ST_Extent("' || columnname || '") As extent FROM "' || tablename || '"' LOOP
+               return myrec.extent;
+       END LOOP;
+END;
+$$
+LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION find_extent(text,text,text) RETURNS box2d AS
+$$
+DECLARE
+       schemaname alias for $1;
+       tablename alias for $2;
+       columnname alias for $3;
+       myrec RECORD;
+
+BEGIN
+       FOR myrec IN EXECUTE 'SELECT ST_Extent("' || columnname || '") FROM "' || schemaname || '"."' || tablename || '" As extent ' LOOP
+               return myrec.extent;
+       END LOOP;
+END;
+$$
+LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+       
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION EndPoint(geometry)
+       RETURNS geometry
+       AS 'MODULE_PATHNAME', 'LWGEOM_endpoint_linestring'
+       LANGUAGE 'C' IMMUTABLE STRICT;
+       
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION ExteriorRing(geometry)
        RETURNS geometry
@@ -834,6 +904,12 @@ CREATE OR REPLACE FUNCTION locate_along_measure(geometry, float8)
        AS $$ SELECT ST_locate_between_measures($1, $2, $2) $$
        LANGUAGE 'sql' IMMUTABLE STRICT;
        
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION MakeBox2d(geometry, geometry)
+       RETURNS box2d
+       AS 'MODULE_PATHNAME', 'BOX2DFLOAT4_construct'
+       LANGUAGE 'C' IMMUTABLE STRICT;
+       
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION MakePolygon(geometry, geometry[])
        RETURNS geometry
@@ -1574,6 +1650,12 @@ CREATE OR REPLACE FUNCTION ST_MakeLine_GArray (geometry[])
        AS 'MODULE_PATHNAME', 'LWGEOM_makeline_garray'
        LANGUAGE 'C' IMMUTABLE STRICT;
        
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION StartPoint(geometry)
+       RETURNS geometry
+       AS 'MODULE_PATHNAME', 'LWGEOM_startpoint_linestring'
+       LANGUAGE 'C' IMMUTABLE STRICT;
+       
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION symdifference(geometry,geometry)
        RETURNS geometry

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index 7aad321f51519a92cea3b6fb20c844d77f6aedbb..bddaa24caa93175589f2dcae0f485d811b99dcca 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -299,12 +299,6 @@ CREATE OR REPLACE FUNCTION box2d(box3d_extent)
        AS 'MODULE_PATHNAME', 'BOX3D_to_BOX2DFLOAT4'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
 \r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION MakeBox2d(geometry, geometry)\r
-       RETURNS box2d\r
-       AS 'MODULE_PATHNAME', 'BOX2DFLOAT4_construct'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
 -- Availability: 1.2.2\r
 CREATE OR REPLACE FUNCTION ST_MakeBox2d(geometry, geometry)\r
        RETURNS box2d\r
@@ -321,15 +315,6 @@ CREATE OR REPLACE FUNCTION ST_Combine_BBox(box2d,geometry)
 -----------------------------------------------------------------------\r
 -- ESTIMATED_EXTENT( <schema name>, <table name>, <column name> )\r
 -----------------------------------------------------------------------\r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION estimated_extent(text,text,text) RETURNS box2d AS\r
-#ifdef GSERIALIZED_ON\r
-       'MODULE_PATHNAME', 'geometry_estimated_extent'\r
-#else\r
-       'MODULE_PATHNAME', 'LWGEOM_estimated_extent'\r
-#endif\r
-       LANGUAGE 'C' IMMUTABLE STRICT SECURITY DEFINER;\r
-\r
 -- Availability: 1.2.2\r
 CREATE OR REPLACE FUNCTION ST_estimated_extent(text,text,text) RETURNS box2d AS\r
 #ifdef GSERIALIZED_ON\r
@@ -342,15 +327,6 @@ CREATE OR REPLACE FUNCTION ST_estimated_extent(text,text,text) RETURNS box2d AS
 -----------------------------------------------------------------------\r
 -- ESTIMATED_EXTENT( <table name>, <column name> )\r
 -----------------------------------------------------------------------\r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION estimated_extent(text,text) RETURNS box2d AS\r
-#ifdef GSERIALIZED_ON\r
-       'MODULE_PATHNAME', 'geometry_estimated_extent'\r
-#else\r
-       'MODULE_PATHNAME', 'LWGEOM_estimated_extent'\r
-#endif\r
-       LANGUAGE 'C' IMMUTABLE STRICT SECURITY DEFINER;\r
-\r
 -- Availability: 1.2.2\r
 CREATE OR REPLACE FUNCTION ST_estimated_extent(text,text) RETURNS box2d AS\r
 #ifdef GSERIALIZED_ON\r
@@ -363,23 +339,6 @@ CREATE OR REPLACE FUNCTION ST_estimated_extent(text,text) RETURNS box2d AS
 -----------------------------------------------------------------------\r
 -- FIND_EXTENT( <schema name>, <table name>, <column name> )\r
 -----------------------------------------------------------------------\r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION find_extent(text,text,text) RETURNS box2d AS\r
-$$\r
-DECLARE\r
-       schemaname alias for $1;\r
-       tablename alias for $2;\r
-       columnname alias for $3;\r
-       myrec RECORD;\r
-\r
-BEGIN\r
-       FOR myrec IN EXECUTE 'SELECT ST_Extent("' || columnname || '") FROM "' || schemaname || '"."' || tablename || '"' LOOP\r
-               return myrec.extent;\r
-       END LOOP;\r
-END;\r
-$$\r
-LANGUAGE 'plpgsql' IMMUTABLE STRICT;\r
-\r
 -- Availability: 1.2.2\r
 CREATE OR REPLACE FUNCTION ST_find_extent(text,text,text) RETURNS box2d AS\r
 $$\r
@@ -390,7 +349,7 @@ DECLARE
        myrec RECORD;\r
 \r
 BEGIN\r
-       FOR myrec IN EXECUTE 'SELECT ST_Extent("' || columnname || '") FROM "' || schemaname || '"."' || tablename || '"' LOOP\r
+       FOR myrec IN EXECUTE 'SELECT ST_Extent("' || columnname || '") As extent FROM "' || schemaname || '"."' || tablename || '"' LOOP\r
                return myrec.extent;\r
        END LOOP;\r
 END;\r
@@ -401,22 +360,6 @@ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
 -----------------------------------------------------------------------\r
 -- FIND_EXTENT( <table name>, <column name> )\r
 -----------------------------------------------------------------------\r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION find_extent(text,text) RETURNS box2d AS\r
-$$\r
-DECLARE\r
-       tablename alias for $1;\r
-       columnname alias for $2;\r
-       myrec RECORD;\r
-\r
-BEGIN\r
-       FOR myrec IN EXECUTE 'SELECT extent("' || columnname || '") FROM "' || tablename || '"' LOOP\r
-               return myrec.extent;\r
-       END LOOP;\r
-END;\r
-$$\r
-LANGUAGE 'plpgsql' IMMUTABLE STRICT;\r
-\r
 -- Availability: 1.2.2\r
 CREATE OR REPLACE FUNCTION ST_find_extent(text,text) RETURNS box2d AS\r
 $$\r
@@ -426,7 +369,7 @@ DECLARE
        myrec RECORD;\r
 \r
 BEGIN\r
-       FOR myrec IN EXECUTE 'SELECT extent("' || columnname || '") FROM "' || tablename || '"' LOOP\r
+       FOR myrec IN EXECUTE 'SELECT ST_Extent("' || columnname || '") As extent FROM "' || tablename || '"' LOOP\r
                return myrec.extent;\r
        END LOOP;\r
 END;\r
@@ -1577,27 +1520,12 @@ $$ LANGUAGE SQL;
 --\r
 -- Aggregate functions\r
 --\r
-\r
-\r
--- Temporary hack function\r
-CREATE OR REPLACE FUNCTION combine_bbox(box3d_extent,geometry)\r
-       RETURNS box3d_extent\r
-       AS 'MODULE_PATHNAME', 'BOX3D_combine'\r
-       LANGUAGE 'C' IMMUTABLE;\r
-\r
 -- Temporary hack function\r
 CREATE OR REPLACE FUNCTION ST_Combine_BBox(box3d_extent,geometry)\r
        RETURNS box3d_extent\r
        AS 'MODULE_PATHNAME', 'BOX3D_combine'\r
        LANGUAGE 'C' IMMUTABLE;\r
 \r
--- Deprecation in 1.2.3\r
-CREATE AGGREGATE Extent(\r
-       sfunc = ST_combine_bbox,\r
-       basetype = geometry,\r
-       stype = box3d_extent\r
-       );\r
-\r
 -- Availability: 1.2.2\r
 CREATE AGGREGATE ST_Extent(\r
        sfunc = ST_combine_bbox,\r
@@ -4128,25 +4056,13 @@ CREATE OR REPLACE FUNCTION ST_M(geometry)
        AS 'MODULE_PATHNAME','LWGEOM_m_point'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
 \r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION StartPoint(geometry)\r
-       RETURNS geometry\r
-       AS 'MODULE_PATHNAME', 'LWGEOM_startpoint_linestring'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
--- PostGIS equivalent function: StartPoint(geometry))\r
+-- PostGIS equivalent function of old StartPoint(geometry))\r
 CREATE OR REPLACE FUNCTION ST_StartPoint(geometry)\r
        RETURNS geometry\r
        AS 'MODULE_PATHNAME', 'LWGEOM_startpoint_linestring'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
 \r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION EndPoint(geometry)\r
-       RETURNS geometry\r
-       AS 'MODULE_PATHNAME', 'LWGEOM_endpoint_linestring'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
--- PostGIS equivalent function: EndPoint(geometry)\r
+-- PostGIS equivalent function of old EndPoint(geometry)\r
 CREATE OR REPLACE FUNCTION ST_EndPoint(geometry)\r
        RETURNS geometry\r
        AS 'MODULE_PATHNAME', 'LWGEOM_endpoint_linestring'\r