#722: Remove all functions with ST_ equivalents from core postgis.sql. Good bye SetSRID

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

diff --git a/postgis/legacy.sql.in.c b/postgis/legacy.sql.in.c
index a62cc2af0e9f8efe16d1cb79db6af03a7c24b29e..c60abfa54b741e6706bd20ff952c39666abfb051 100644 (file)
--- a/postgis/legacy.sql.in.c
+++ b/postgis/legacy.sql.in.c
@@ -26,6 +26,12 @@ CREATE OR REPLACE FUNCTION noop(geometry)
        AS 'MODULE_PATHNAME', 'LWGEOM_noop'
        LANGUAGE 'C' VOLATILE STRICT;
        
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION SetSRID(geometry,int4)
+       RETURNS geometry
+       AS 'MODULE_PATHNAME','LWGEOM_set_srid'
+       LANGUAGE 'C' IMMUTABLE 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 5ae23fb94906f0026f88a238a5b86ff966f61f01..d8af57d29a0d26fee529d36471560136f7a2cb5e 100644 (file)
--- a/postgis/legacy_compatibility_layer.sql.in.c
+++ b/postgis/legacy_compatibility_layer.sql.in.c
@@ -35,6 +35,12 @@ CREATE OR REPLACE FUNCTION ndims(geometry)
        AS 'MODULE_PATHNAME', 'LWGEOM_ndims'
        LANGUAGE 'C' IMMUTABLE STRICT;
        
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION SetSRID(geometry,int4)
+       RETURNS geometry
+       AS 'MODULE_PATHNAME','LWGEOM_set_srid'
+       LANGUAGE 'C' IMMUTABLE STRICT;
+       
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION SRID(geometry)
        RETURNS int4

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index 49b41f0b18a302dae671dd3d57bef39e36c5cebd..968c462a651111fe7c49440771cfdbc173087d70 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -3430,12 +3430,6 @@ CREATE OR REPLACE FUNCTION ST_SRID(geometry)
        AS 'MODULE_PATHNAME','LWGEOM_get_srid'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
 \r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION SetSRID(geometry,int4)\r
-       RETURNS geometry\r
-       AS 'MODULE_PATHNAME','LWGEOM_set_srid'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
 -- Availability: 1.2.2\r
 CREATE OR REPLACE FUNCTION ST_SetSRID(geometry,int4)\r
        RETURNS geometry\r

diff --git a/postgis/uninstall_legacy.sql.in.c b/postgis/uninstall_legacy.sql.in.c
index 97e3cfa9d5148fd97d112fa7992db3e2490127a4..1353d6f3a656069d568e1f94138bda93ab97f215 100644 (file)
--- a/postgis/uninstall_legacy.sql.in.c
+++ b/postgis/uninstall_legacy.sql.in.c
@@ -112,6 +112,7 @@ DROP FUNCTION IF EXISTS mem_size(geometry);
 DROP FUNCTION IF EXISTS MPolyFromWKB(bytea);
 DROP FUNCTION IF EXISTS multi(geometry);
 
+DROP FUNCTION IF EXISTS SetSRID(geometry, int4);
 DROP FUNCTION IF EXISTS SnapToGrid(geometry, float8, float8, float8, float8);
 DROP FUNCTION IF EXISTS SnapToGrid(geometry, float8);
 DROP FUNCTION IF EXISTS SnapToGrid(geometry, geometry, float8, float8, float8, float8);