From 7fe8dfc68af94d3aba25476b482c98feaa831279 Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Sun, 1 Jan 2012 23:42:54 +0000 Subject: [PATCH] #722: Good bye GeomFromWKB, GeomFromText git-svn-id: http://svn.osgeo.org/postgis/trunk@8644 b70326c6-7e19-0410-871a-916f4a2858ee --- postgis/legacy.sql.in.c | 29 +++++++++-- postgis/legacy_compatibility_layer.sql.in.c | 10 ++++ postgis/postgis.sql.in.c | 55 ++++----------------- postgis/uninstall_legacy.sql.in.c | 6 +++ 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/postgis/legacy.sql.in.c b/postgis/legacy.sql.in.c index c60abfa54..f8565e3b7 100644 --- 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 d8af57d29..72b84463a 100644 --- 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 617e29c89..abeb80ec6 100644 --- 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' 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; - -- Availability: 1.2.2 CREATE OR REPLACE FUNCTION ST_GeometryFromText(text) RETURNS geometry AS 'MODULE_PATHNAME','LWGEOM_from_text' LANGUAGE 'C' IMMUTABLE STRICT; --- Deprecation in 1.2.3 -CREATE OR REPLACE FUNCTION GeometryFromText(text, int4) - RETURNS geometry - AS 'MODULE_PATHNAME','LWGEOM_from_text' - LANGUAGE 'C' IMMUTABLE STRICT; - -- Availability: 1.2.2 CREATE OR REPLACE FUNCTION ST_GeometryFromText(text, int4) RETURNS geometry AS 'MODULE_PATHNAME','LWGEOM_from_text' LANGUAGE 'C' IMMUTABLE STRICT; --- Deprecation in 1.2.3 -CREATE OR REPLACE FUNCTION GeomFromText(text) - RETURNS geometry AS 'SELECT geometryfromtext($1)' - LANGUAGE 'SQL' IMMUTABLE STRICT; - -- Availability: 1.2.2 CREATE OR REPLACE FUNCTION ST_GeomFromText(text) RETURNS geometry AS 'MODULE_PATHNAME','LWGEOM_from_text' LANGUAGE 'C' IMMUTABLE STRICT; --- Deprecation in 1.2.3 -CREATE OR REPLACE FUNCTION GeomFromText(text, int4) - RETURNS geometry AS 'SELECT geometryfromtext($1, $2)' - LANGUAGE 'SQL' IMMUTABLE STRICT; - -- PostGIS equivalent function: ST_GeometryFromText(text, int4) CREATE OR REPLACE FUNCTION ST_GeomFromText(text, int4) RETURNS geometry AS 'MODULE_PATHNAME','LWGEOM_from_text' LANGUAGE 'C' IMMUTABLE STRICT; - -- Availability: 1.2.2 CREATE OR REPLACE FUNCTION ST_PointFromText(text) RETURNS geometry @@ -3492,8 +3469,8 @@ CREATE OR REPLACE FUNCTION ST_LineFromText(text) CREATE OR REPLACE FUNCTION ST_LineFromText(text, int4) RETURNS geometry AS ' - SELECT CASE WHEN geometrytype(GeomFromText($1, $2)) = ''LINESTRING'' - THEN GeomFromText($1,$2) + SELECT CASE WHEN geometrytype(ST_GeomFromText($1, $2)) = ''LINESTRING'' + THEN ST_GeomFromText($1,$2) ELSE NULL END ' LANGUAGE 'SQL' IMMUTABLE STRICT; @@ -3536,7 +3513,7 @@ CREATE OR REPLACE FUNCTION ST_MLineFromText(text, int4) AS ' SELECT CASE WHEN geometrytype(ST_GeomFromText($1, $2)) = ''MULTILINESTRING'' - THEN GeomFromText($1,$2) + THEN ST_GeomFromText($1,$2) ELSE NULL END ' LANGUAGE 'SQL' IMMUTABLE STRICT; @@ -3569,7 +3546,7 @@ CREATE OR REPLACE FUNCTION ST_MPointFromText(text, int4) RETURNS geometry AS ' SELECT CASE WHEN geometrytype(ST_GeomFromText($1, $2)) = ''MULTIPOINT'' - THEN GeomFromText($1, $2) + THEN ST_GeomFromText($1, $2) ELSE NULL END ' LANGUAGE 'SQL' IMMUTABLE STRICT; @@ -3650,24 +3627,12 @@ CREATE OR REPLACE FUNCTION ST_GeomCollFromText(text) ' LANGUAGE 'SQL' IMMUTABLE STRICT; --- Deprecation in 1.2.3 -CREATE OR REPLACE FUNCTION GeomFromWKB(bytea) - RETURNS geometry - AS 'MODULE_PATHNAME','LWGEOM_from_WKB' - LANGUAGE 'C' IMMUTABLE STRICT; - -- Availability: 1.2.2 CREATE OR REPLACE FUNCTION ST_GeomFromWKB(bytea) RETURNS geometry 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(GeomFromWKB($1), $2)' - LANGUAGE 'SQL' IMMUTABLE STRICT; - -- PostGIS equivalent function: GeomFromWKB(bytea, int) CREATE OR REPLACE FUNCTION ST_GeomFromWKB(bytea, int) RETURNS geometry @@ -3728,8 +3693,8 @@ CREATE OR REPLACE FUNCTION ST_LinestringFromWKB(bytea, int) CREATE OR REPLACE FUNCTION ST_LinestringFromWKB(bytea) RETURNS geometry AS ' - SELECT CASE WHEN geometrytype(GeomFromWKB($1)) = ''LINESTRING'' - THEN GeomFromWKB($1) + SELECT CASE WHEN geometrytype(ST_GeomFromWKB($1)) = ''LINESTRING'' + THEN ST_GeomFromWKB($1) ELSE NULL END ' LANGUAGE 'SQL' IMMUTABLE STRICT; @@ -3769,7 +3734,7 @@ CREATE OR REPLACE FUNCTION ST_PolygonFromWKB(bytea) RETURNS geometry AS ' SELECT CASE WHEN geometrytype(ST_GeomFromWKB($1)) = ''POLYGON'' - THEN GeomFromWKB($1) + THEN ST_GeomFromWKB($1) ELSE NULL END ' LANGUAGE 'SQL' IMMUTABLE STRICT; @@ -3779,7 +3744,7 @@ CREATE OR REPLACE FUNCTION ST_MPointFromWKB(bytea, int) RETURNS geometry AS ' SELECT CASE WHEN geometrytype(ST_GeomFromWKB($1, $2)) = ''MULTIPOINT'' - THEN GeomFromWKB($1, $2) + THEN ST_GeomFromWKB($1, $2) ELSE NULL END ' LANGUAGE 'SQL' IMMUTABLE STRICT; @@ -3892,8 +3857,8 @@ CREATE OR REPLACE FUNCTION ST_GeomCollFromWKB(bytea, int) RETURNS geometry AS ' SELECT CASE - WHEN geometrytype(GeomFromWKB($1, $2)) = ''GEOMETRYCOLLECTION'' - THEN GeomFromWKB($1, $2) + WHEN geometrytype(ST_GeomFromWKB($1, $2)) = ''GEOMETRYCOLLECTION'' + THEN ST_GeomFromWKB($1, $2) ELSE NULL END ' LANGUAGE 'SQL' IMMUTABLE STRICT; diff --git a/postgis/uninstall_legacy.sql.in.c b/postgis/uninstall_legacy.sql.in.c index 1353d6f3a..6d521f025 100644 --- 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); -- 2.50.1