From 4c4cb22cb0e245dca48561e4f566c8e98e41d7df Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Sun, 1 Jan 2012 13:24:53 +0000 Subject: [PATCH] #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 --- postgis/legacy.sql.in.c | 6 ++++++ postgis/legacy_compatibility_layer.sql.in.c | 6 ++++++ postgis/postgis.sql.in.c | 6 ------ postgis/uninstall_legacy.sql.in.c | 1 + 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/postgis/legacy.sql.in.c b/postgis/legacy.sql.in.c index a62cc2af0..c60abfa54 100644 --- 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 5ae23fb94..d8af57d29 100644 --- 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 49b41f0b1..968c462a6 100644 --- 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' 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; - -- Availability: 1.2.2 CREATE OR REPLACE FUNCTION ST_SetSRID(geometry,int4) RETURNS geometry diff --git a/postgis/uninstall_legacy.sql.in.c b/postgis/uninstall_legacy.sql.in.c index 97e3cfa9d..1353d6f3a 100644 --- 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); -- 2.40.0