#722 remove AsBinary and AsText, #949 more additons to uninstall (AsText,Asbinary...

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

diff --git a/postgis/legacy.sql.in.c b/postgis/legacy.sql.in.c
index ccc1e26b279296596a221ad88439bde4ae05a580..6db1cb1719d657f10bdcf41d8537b934bb88cef8 100644 (file)
--- a/postgis/legacy.sql.in.c
+++ b/postgis/legacy.sql.in.c
@@ -417,6 +417,18 @@ CREATE OR REPLACE FUNCTION Area2D(geometry)
        AS 'MODULE_PATHNAME', 'LWGEOM_area_polygon'
        LANGUAGE 'C' IMMUTABLE STRICT;
        
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION AsBinary(geometry)
+       RETURNS bytea
+       AS 'MODULE_PATHNAME','LWGEOM_asBinary'
+       LANGUAGE 'C' IMMUTABLE STRICT;
+       
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION AsBinary(geometry,text)
+       RETURNS bytea
+       AS 'MODULE_PATHNAME','LWGEOM_asBinary'
+       LANGUAGE 'C' IMMUTABLE STRICT;
+
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION AsEWKB(geometry)
        RETURNS BYTEA
@@ -436,38 +448,38 @@ CREATE OR REPLACE FUNCTION AsEWKT(geometry)
        AS 'MODULE_PATHNAME','LWGEOM_asEWKT'
        LANGUAGE 'C' IMMUTABLE STRICT;
        
+-- AsGML(geom) / precision=15 version=2
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION AsGML(geometry, int4)
+CREATE OR REPLACE FUNCTION AsGML(geometry)
        RETURNS TEXT
-       AS 'SELECT _ST_AsGML(2, $1, $2, 0, null)'
+       AS 'SELECT _ST_AsGML(2, $1, 15, 0, null)'
        LANGUAGE 'SQL' IMMUTABLE STRICT;
        
--- AsGML(geom) / precision=15 version=2
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION AsGML(geometry)
+CREATE OR REPLACE FUNCTION AsGML(geometry, int4)
        RETURNS TEXT
-       AS 'SELECT _ST_AsGML(2, $1, 15, 0, null)'
+       AS 'SELECT _ST_AsGML(2, $1, $2, 0, null)'
        LANGUAGE 'SQL' IMMUTABLE STRICT;
        
 -- AsKML(geom, precision) / version=2
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION AsKML(geometry, int4)
        RETURNS TEXT
-       AS 'SELECT _ST_AsKML(2, transform($1,4326), $2, null)'
+       AS 'SELECT _ST_AsKML(2, ST_transform($1,4326), $2, null)'
        LANGUAGE 'SQL' IMMUTABLE STRICT;
        
 -- AsKML(geom) / precision=15 version=2
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION AsKML(geometry)
        RETURNS TEXT
-       AS 'SELECT _ST_AsKML(2, transform($1,4326), 15, null)'
+       AS 'SELECT _ST_AsKML(2, ST_Transform($1,4326), 15, null)'
        LANGUAGE 'SQL' IMMUTABLE STRICT;
        
 -- AsKML(version, geom, precision)
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION AsKML(int4, geometry, int4)
        RETURNS TEXT
-       AS 'SELECT _ST_AsKML($1, transform($2,4326), $3, null)'
+       AS 'SELECT _ST_AsKML($1, ST_Transform($2,4326), $3, null)'
        LANGUAGE 'SQL' IMMUTABLE STRICT;
        
 -- Deprecation in 1.2.3
@@ -483,10 +495,11 @@ CREATE OR REPLACE FUNCTION AsHEXEWKB(geometry, text)
        LANGUAGE 'C' IMMUTABLE STRICT;
        
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION AsSVG(geometry,int4,int4)
+CREATE OR REPLACE FUNCTION AsSVG(geometry)
        RETURNS TEXT
        AS 'MODULE_PATHNAME','LWGEOM_asSVG'
-       LANGUAGE 'C' IMMUTABLE STRICT;  
+       LANGUAGE 'C' IMMUTABLE STRICT;
+       
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION AsSVG(geometry,int4)
        RETURNS TEXT
@@ -494,11 +507,17 @@ CREATE OR REPLACE FUNCTION AsSVG(geometry,int4)
        LANGUAGE 'C' IMMUTABLE STRICT;
        
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION AsSVG(geometry)
+CREATE OR REPLACE FUNCTION AsSVG(geometry,int4,int4)
        RETURNS TEXT
        AS 'MODULE_PATHNAME','LWGEOM_asSVG'
        LANGUAGE 'C' IMMUTABLE STRICT;
 
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION AsText(geometry)
+       RETURNS TEXT
+       AS 'MODULE_PATHNAME','LWGEOM_asText'
+       LANGUAGE 'C' IMMUTABLE STRICT;  
+
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION azimuth(geometry,geometry)
        RETURNS float8
@@ -515,14 +534,14 @@ DECLARE
        mline geometry;
        geom geometry;
 BEGIN
-       mline := MultiLineStringFromText(geomtext, srid);
+       mline := ST_MultiLineStringFromText(geomtext, srid);
 
        IF mline IS NULL
        THEN
                RAISE EXCEPTION 'Input is not a MultiLinestring';
        END IF;
 
-       geom := BuildArea(mline);
+       geom := ST_BuildArea(mline);
 
        IF GeometryType(geom) != 'POLYGON'
        THEN
@@ -544,7 +563,7 @@ DECLARE
        mline geometry;
        geom geometry;
 BEGIN
-       mline := MultiLineStringFromText(geomtext, srid);
+       mline := ST_MultiLineStringFromText(geomtext, srid);
 
        IF mline IS NULL
        THEN

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index 663a306f43daf15e89ebf7688aba833b752924ac..a557b17782382b74caf9e7d5c1960e28b2ff7693 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -4122,37 +4122,19 @@ CREATE OR REPLACE FUNCTION ST_SetSRID(geometry,int4)
        RETURNS geometry\r
        AS 'MODULE_PATHNAME','LWGEOM_set_srid'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION AsBinary(geometry)\r
+       \r
+-- Availability: 1.2.2\r
+CREATE OR REPLACE FUNCTION ST_AsBinary(geometry,text)\r
        RETURNS bytea\r
        AS 'MODULE_PATHNAME','LWGEOM_asBinary'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
--- PostGIS equivalent function: AsBinary(geometry)\r
+       \r
+-- PostGIS equivalent of old function: AsBinary(geometry)\r
 CREATE OR REPLACE FUNCTION ST_AsBinary(geometry)\r
        RETURNS bytea\r
        AS 'MODULE_PATHNAME','LWGEOM_asBinary'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION AsBinary(geometry,text)\r
-       RETURNS bytea\r
-       AS 'MODULE_PATHNAME','LWGEOM_asBinary'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
--- Availability: 1.2.2\r
-CREATE OR REPLACE FUNCTION ST_AsBinary(geometry,text)\r
-       RETURNS bytea\r
-       AS 'MODULE_PATHNAME','LWGEOM_asBinary'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION AsText(geometry)\r
-       RETURNS TEXT\r
-       AS 'MODULE_PATHNAME','LWGEOM_asText'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
+       \r
 -- PostGIS equivalent function: AsText(geometry)\r
 CREATE OR REPLACE FUNCTION ST_AsText(geometry)\r
        RETURNS TEXT\r

diff --git a/postgis/uninstall_legacy.sql.in.c b/postgis/uninstall_legacy.sql.in.c
index 531ee37a6918b759c4a63422572d72537f66f624..5af3de885766e6e945380f54c972b875d6fd513c 100644 (file)
--- a/postgis/uninstall_legacy.sql.in.c
+++ b/postgis/uninstall_legacy.sql.in.c
@@ -21,3 +21,18 @@ DROP FUNCTION IF EXISTS AddPoint(geometry,geometry);
 DROP FUNCTION IF EXISTS AddPoint(geometry,geometry, integer);
 DROP FUNCTION IF EXISTS Area(geometry);
 DROP FUNCTION IF EXISTS Area2D(geometry);
+DROP FUNCTION IF EXISTS AsBinary(geometry);
+DROP FUNCTION IF EXISTS AsBinary(geometry,text);
+DROP FUNCTION IF EXISTS AsEWKB(geometry);
+DROP FUNCTION IF EXISTS AsEWKB(geometry,text);
+DROP FUNCTION IF EXISTS AsEWKT(geometry);
+DROP FUNCTION IF EXISTS AsGML(geometry);
+DROP FUNCTION IF EXISTS AsGML(geometry,int4);
+DROP FUNCTION IF EXISTS AsKML(geometry);
+DROP FUNCTION IF EXISTS AsKML(geometry,int4);
+DROP FUNCTION IF EXISTS AsHEXEWKB(geometry);
+DROP FUNCTION IF EXISTS AsHEXEWKB(geometry,text);
+DROP FUNCTION IF EXISTS AsSVG(geometry);
+DROP FUNCTION IF EXISTS AsSVG(geometry,int4);
+DROP FUNCTION IF EXISTS AsSVG(geometry,int4,int4);
+DROP FUNCTION IF EXISTS AsText(geometry);