From 6e2c7de634485dfb9505e20fd80708ad2e4456cd Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Thu, 22 Dec 2011 10:21:21 +0000 Subject: [PATCH] Deprecate Polygonize and Collect aggregates [#1400] git-svn-id: http://svn.osgeo.org/postgis/trunk@8504 b70326c6-7e19-0410-871a-916f4a2858ee --- postgis/postgis.sql.in.c | 16 ---------------- postgis/postgis_drop.sql.in.c | 4 +++- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c index e17ff4aef..c81f074c9 100644 --- a/postgis/postgis.sql.in.c +++ b/postgis/postgis.sql.in.c @@ -2844,14 +2844,6 @@ CREATE AGGREGATE ST_Union ( finalfunc = pgis_geometry_union_finalfn ); --- Deprecation in 1.2.3 -CREATE AGGREGATE collect ( - basetype = geometry, - sfunc = pgis_geometry_accum_transfn, - stype = pgis_abs, - finalfunc = pgis_geometry_collect_finalfn -); - -- Availability: 1.2.2 CREATE AGGREGATE ST_Collect ( BASETYPE = geometry, @@ -2860,14 +2852,6 @@ CREATE AGGREGATE ST_Collect ( FINALFUNC = pgis_geometry_collect_finalfn ); --- Deprecation in 1.2.3 -CREATE AGGREGATE Polygonize ( - BASETYPE = geometry, - SFUNC = pgis_geometry_accum_transfn, - STYPE = pgis_abs, - FINALFUNC = pgis_geometry_polygonize_finalfn - ); - -- Availability: 1.2.2 CREATE AGGREGATE ST_Polygonize ( BASETYPE = geometry, diff --git a/postgis/postgis_drop.sql.in.c b/postgis/postgis_drop.sql.in.c index 68a16938f..02f19357b 100644 --- a/postgis/postgis_drop.sql.in.c +++ b/postgis/postgis_drop.sql.in.c @@ -2,6 +2,8 @@ -- First drop old aggregates DROP AGGREGATE IF EXISTS memgeomunion(geometry); DROP AGGREGATE IF EXISTS geomunion(geometry); +DROP AGGREGATE IF EXISTS polygonize(geometry); -- Deprecated in 1.2.3, Dropped in 2.0.0 +DROP AGGREGATE IF EXISTS collect(geometry); -- Deprecated in 1.2.3, Dropped in 2.0.0 DROP AGGREGATE IF EXISTS st_geomunion(geometry); DROP AGGREGATE IF EXISTS accum_old(geometry); DROP AGGREGATE IF EXISTS st_accum_old(geometry); @@ -82,4 +84,4 @@ DROP FUNCTION IF EXISTS st_geometry_gt(geometry, geometry); DROP FUNCTION IF EXISTS st_geometry_ge(geometry, geometry); DROP FUNCTION IF EXISTS st_geometry_eq(geometry, geometry); DROP FUNCTION IF EXISTS st_geometry_cmp(geometry, geometry); -DROP FUNCTION IF EXISTS SnapToGrid(geometry, float8, float8); \ No newline at end of file +DROP FUNCTION IF EXISTS SnapToGrid(geometry, float8, float8); -- 2.40.0