#722: Good bye GeomFromWKB, GeomFromText

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

diff --git a/postgis/legacy.sql.in.c b/postgis/legacy.sql.in.c
index c60abfa54b741e6706bd20ff952c39666abfb051..f8565e3b7f0e477e4c8f96d62351389203c8a6c8 100644 (file)
--- a/postgis/legacy.sql.in.c
+++ b/postgis/legacy.sql.in.c
@@ -21,17 +21,36 @@ CREATE OR REPLACE FUNCTION hasbbox(geometry)
        LANGUAGE 'C' IMMUTABLE STRICT;
        
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION noop(geometry)
+CREATE OR REPLACE FUNCTION GeometryFromText(text, int4)
        RETURNS geometry
-       AS 'MODULE_PATHNAME', 'LWGEOM_noop'
-       LANGUAGE 'C' VOLATILE STRICT;
+       AS 'MODULE_PATHNAME','LWGEOM_from_text'
+       LANGUAGE 'C' IMMUTABLE STRICT;
+       
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION GeometryFromText(text)
+       RETURNS geometry
+       AS 'MODULE_PATHNAME','LWGEOM_from_text'
+       LANGUAGE 'C' IMMUTABLE STRICT;
        
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION SetSRID(geometry,int4)
+CREATE OR REPLACE FUNCTION GeomFromWKB(bytea)
        RETURNS geometry
-       AS 'MODULE_PATHNAME','LWGEOM_set_srid'
+       AS 'MODULE_PATHNAME','LWGEOM_from_WKB'
        LANGUAGE 'C' IMMUTABLE STRICT;
        
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION GeomFromWKB(bytea, int)
+       RETURNS geometry
+       AS 'SELECT ST_SetSRID(ST_GeomFromWKB($1), $2)'
+       LANGUAGE 'SQL' IMMUTABLE STRICT;
+       
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION noop(geometry)
+       RETURNS geometry
+       AS 'MODULE_PATHNAME', 'LWGEOM_noop'
+       LANGUAGE 'C' VOLATILE STRICT;
+       
+       
 --- Deprecation in 1.5.0
 CREATE OR REPLACE FUNCTION st_box2d(geometry)
        RETURNS box2d

diff --git a/postgis/legacy_compatibility_layer.sql.in.c b/postgis/legacy_compatibility_layer.sql.in.c
index d8af57d29a0d26fee529d36471560136f7a2cb5e..72b84463a0035bca6fbe18a61660bfdf666142ab 100644 (file)
--- a/postgis/legacy_compatibility_layer.sql.in.c
+++ b/postgis/legacy_compatibility_layer.sql.in.c
@@ -29,6 +29,16 @@ CREATE OR REPLACE FUNCTION Estimated_Extent(text,text) RETURNS box2d AS
        'MODULE_PATHNAME', 'geometry_estimated_extent'
        LANGUAGE 'C' IMMUTABLE STRICT SECURITY DEFINER;
        
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION GeomFromText(text, int4)
+       RETURNS geometry AS 'SELECT ST_GeomFromText($1, $2)'
+       LANGUAGE 'SQL' IMMUTABLE STRICT;
+       
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION GeomFromText(text)
+       RETURNS geometry AS 'SELECT ST_GeomFromText($1)'
+       LANGUAGE 'SQL' IMMUTABLE STRICT;
+       
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION ndims(geometry)
        RETURNS smallint

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index 617e29c892b5234287ca32c2c56c0a5c375f0eee..abeb80ec6c0f0fc1a554671445e9914040561168 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -3409,53 +3409,30 @@ CREATE OR REPLACE FUNCTION ST_AsText(geometry)
        AS 'MODULE_PATHNAME','LWGEOM_asText'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
 \r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION GeometryFromText(text)\r
-       RETURNS geometry\r
-       AS 'MODULE_PATHNAME','LWGEOM_from_text'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
 -- Availability: 1.2.2\r
 CREATE OR REPLACE FUNCTION ST_GeometryFromText(text)\r
        RETURNS geometry\r
        AS 'MODULE_PATHNAME','LWGEOM_from_text'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
 \r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION GeometryFromText(text, int4)\r
-       RETURNS geometry\r
-       AS 'MODULE_PATHNAME','LWGEOM_from_text'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
 -- Availability: 1.2.2\r
 CREATE OR REPLACE FUNCTION ST_GeometryFromText(text, int4)\r
        RETURNS geometry\r
        AS 'MODULE_PATHNAME','LWGEOM_from_text'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
 \r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION GeomFromText(text)\r
-       RETURNS geometry AS 'SELECT geometryfromtext($1)'\r
-       LANGUAGE 'SQL' IMMUTABLE STRICT;\r
-\r
 -- Availability: 1.2.2\r
 CREATE OR REPLACE FUNCTION ST_GeomFromText(text)\r
        RETURNS geometry\r
        AS 'MODULE_PATHNAME','LWGEOM_from_text'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
 \r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION GeomFromText(text, int4)\r
-       RETURNS geometry AS 'SELECT geometryfromtext($1, $2)'\r
-       LANGUAGE 'SQL' IMMUTABLE STRICT;\r
-\r
 -- PostGIS equivalent function: ST_GeometryFromText(text, int4)\r
 CREATE OR REPLACE FUNCTION ST_GeomFromText(text, int4)\r
        RETURNS geometry\r
        AS 'MODULE_PATHNAME','LWGEOM_from_text'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
 \r
-\r
 -- Availability: 1.2.2\r
 CREATE OR REPLACE FUNCTION ST_PointFromText(text)\r
        RETURNS geometry\r
@@ -3492,8 +3469,8 @@ CREATE OR REPLACE FUNCTION ST_LineFromText(text)
 CREATE OR REPLACE FUNCTION ST_LineFromText(text, int4)\r
        RETURNS geometry\r
        AS '\r
-       SELECT CASE WHEN geometrytype(GeomFromText($1, $2)) = ''LINESTRING''\r
-       THEN GeomFromText($1,$2)\r
+       SELECT CASE WHEN geometrytype(ST_GeomFromText($1, $2)) = ''LINESTRING''\r
+       THEN ST_GeomFromText($1,$2)\r
        ELSE NULL END\r
        '\r
        LANGUAGE 'SQL' IMMUTABLE STRICT;\r
@@ -3536,7 +3513,7 @@ CREATE OR REPLACE FUNCTION ST_MLineFromText(text, int4)
        AS '\r
        SELECT CASE\r
        WHEN geometrytype(ST_GeomFromText($1, $2)) = ''MULTILINESTRING''\r
-       THEN GeomFromText($1,$2)\r
+       THEN ST_GeomFromText($1,$2)\r
        ELSE NULL END\r
        '\r
        LANGUAGE 'SQL' IMMUTABLE STRICT;\r
@@ -3569,7 +3546,7 @@ CREATE OR REPLACE FUNCTION ST_MPointFromText(text, int4)
        RETURNS geometry\r
        AS '\r
        SELECT CASE WHEN geometrytype(ST_GeomFromText($1, $2)) = ''MULTIPOINT''\r
-       THEN GeomFromText($1, $2)\r
+       THEN ST_GeomFromText($1, $2)\r
        ELSE NULL END\r
        '\r
        LANGUAGE 'SQL' IMMUTABLE STRICT;\r
@@ -3650,24 +3627,12 @@ CREATE OR REPLACE FUNCTION ST_GeomCollFromText(text)
        '\r
        LANGUAGE 'SQL' IMMUTABLE STRICT;\r
 \r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION GeomFromWKB(bytea)\r
-       RETURNS geometry\r
-       AS 'MODULE_PATHNAME','LWGEOM_from_WKB'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
 -- Availability: 1.2.2\r
 CREATE OR REPLACE FUNCTION ST_GeomFromWKB(bytea)\r
        RETURNS geometry\r
        AS 'MODULE_PATHNAME','LWGEOM_from_WKB'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
 \r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION GeomFromWKB(bytea, int)\r
-       RETURNS geometry\r
-       AS 'SELECT ST_SetSRID(GeomFromWKB($1), $2)'\r
-       LANGUAGE 'SQL' IMMUTABLE STRICT;\r
-\r
 -- PostGIS equivalent function: GeomFromWKB(bytea, int)\r
 CREATE OR REPLACE FUNCTION ST_GeomFromWKB(bytea, int)\r
        RETURNS geometry\r
@@ -3728,8 +3693,8 @@ CREATE OR REPLACE FUNCTION ST_LinestringFromWKB(bytea, int)
 CREATE OR REPLACE FUNCTION ST_LinestringFromWKB(bytea)\r
        RETURNS geometry\r
        AS '\r
-       SELECT CASE WHEN geometrytype(GeomFromWKB($1)) = ''LINESTRING''\r
-       THEN GeomFromWKB($1)\r
+       SELECT CASE WHEN geometrytype(ST_GeomFromWKB($1)) = ''LINESTRING''\r
+       THEN ST_GeomFromWKB($1)\r
        ELSE NULL END\r
        '\r
        LANGUAGE 'SQL' IMMUTABLE STRICT;\r
@@ -3769,7 +3734,7 @@ CREATE OR REPLACE FUNCTION ST_PolygonFromWKB(bytea)
        RETURNS geometry\r
        AS '\r
        SELECT CASE WHEN geometrytype(ST_GeomFromWKB($1)) = ''POLYGON''\r
-       THEN GeomFromWKB($1)\r
+       THEN ST_GeomFromWKB($1)\r
        ELSE NULL END\r
        '\r
        LANGUAGE 'SQL' IMMUTABLE STRICT;\r
@@ -3779,7 +3744,7 @@ CREATE OR REPLACE FUNCTION ST_MPointFromWKB(bytea, int)
        RETURNS geometry\r
        AS '\r
        SELECT CASE WHEN geometrytype(ST_GeomFromWKB($1, $2)) = ''MULTIPOINT''\r
-       THEN GeomFromWKB($1, $2)\r
+       THEN ST_GeomFromWKB($1, $2)\r
        ELSE NULL END\r
        '\r
        LANGUAGE 'SQL' IMMUTABLE STRICT;\r
@@ -3892,8 +3857,8 @@ CREATE OR REPLACE FUNCTION ST_GeomCollFromWKB(bytea, int)
        RETURNS geometry\r
        AS '\r
        SELECT CASE\r
-       WHEN geometrytype(GeomFromWKB($1, $2)) = ''GEOMETRYCOLLECTION''\r
-       THEN GeomFromWKB($1, $2)\r
+       WHEN geometrytype(ST_GeomFromWKB($1, $2)) = ''GEOMETRYCOLLECTION''\r
+       THEN ST_GeomFromWKB($1, $2)\r
        ELSE NULL END\r
        '\r
        LANGUAGE 'SQL' IMMUTABLE STRICT;\r

diff --git a/postgis/uninstall_legacy.sql.in.c b/postgis/uninstall_legacy.sql.in.c
index 1353d6f3a656069d568e1f94138bda93ab97f215..6d521f0250a3ffe26e6211e41cb44fb380dae7aa 100644 (file)
--- a/postgis/uninstall_legacy.sql.in.c
+++ b/postgis/uninstall_legacy.sql.in.c
@@ -92,6 +92,12 @@ 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 GeometryFromText(text);
+DROP FUNCTION IF EXISTS GeometryFromText(text,int4);
+DROP FUNCTION IF EXISTS GeomFromText(text);
+DROP FUNCTION IF EXISTS GeomFromText(text,int4);
+DROP FUNCTION IF EXISTS GeomFromWKB(bytea);
+DROP FUNCTION IF EXISTS GeomFromWKB(bytea, int);
 DROP FUNCTION IF EXISTS GeometryN(geometry,integer);
 DROP FUNCTION IF EXISTS GeomUnion(geometry,geometry);
 DROP FUNCTION IF EXISTS getbbox(geometry);