From: Sandro Santilli <strk@keybit.net>
Date: Fri, 27 Sep 2013 16:34:30 +0000 (+0000)
Subject: Add deprecation WARNINGS for functions deprecated 1 version ago
X-Git-Tag: 2.2.0rc1~1354
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c7c45cae7a0935a00ed73bbd2cd15ca0cca09cf;p=postgis

Add deprecation WARNINGS for functions deprecated 1 version ago

NOTE: it means a full version cycle with non-warned deprecations

See #2440

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

diff --git a/regress/regress.sql b/regress/regress.sql
index fbefa1386..ba3a9f277 100644
--- a/regress/regress.sql
+++ b/regress/regress.sql
@@ -234,16 +234,20 @@ select '141', ST_AsEWKT(ST_multi(ST_setsrid('LINESTRING(2 2, 3 3)'::geometry, 4)
 select '142', ST_AsEWKT(ST_multi(ST_setsrid('LINESTRING(2 2, 3 3)'::geometry, 5)));
 select '143', ST_AsEWKT(ST_multi(ST_setsrid('POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))'::geometry, 6)));
 select '143c1', ST_AsEWKT(ST_multi('CIRCULARSTRING(0 0, 1 1, 2 2)'::geometry));
-select '144', ST_AsEWKT(ST_force_3dm('POINT(1 2 3)'));
-select '145', ST_AsEWKT(ST_force_3dz('POINTM(1 2 3)'));
-select '146', ST_AsEWKT(ST_force_4d('POINTM(1 2 3)'));
-select '147', ST_AsEWKT(ST_force_4d('POINT(1 2 3)'));
+select '144', ST_AsEWKT(ST_Force3dm('POINT(1 2 3)'));
+select '144d', ST_AsEWKT(ST_Force_3dm('POINT(1 2 3)'));
+select '145', ST_AsEWKT(ST_Force3dz('POINTM(1 2 3)'));
+select '145d', ST_AsEWKT(ST_Force_3dz('POINTM(1 2 3)'));
+select '146', ST_AsEWKT(ST_Force4d('POINTM(1 2 3)'));
+select '147', ST_AsEWKT(ST_Force4d('POINT(1 2 3)'));
+select '147d', ST_AsEWKT(ST_Force_4d('POINT(1 2 3)'));
 
 select '148', ST_AsText(ST_segmentize('LINESTRING(0 0, 10 0)'::geometry, 5));
 
 select '149', ST_AsText(ST_segmentize('GEOMETRYCOLLECTION EMPTY'::geometry, 0.5));
 
-select '150', ST_AsEWKT(ST_force_collection(ST_setsrid('POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))'::geometry, 6)));
+select '150d', ST_AsEWKT(ST_ForceCollection(ST_setsrid('POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))'::geometry, 6)));
+select '150', ST_AsEWKT(ST_ForceCollection(ST_setsrid('POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))'::geometry, 6)));
 
 select '151', encode(ST_AsBinary(ST_MakeEnvelope(0, 0, 1, 1, 4326),'ndr'),'hex');
 select '152', ST_SRID(ST_MakeEnvelope(0, 0, 1, 1, 4326));
diff --git a/regress/regress_expected b/regress/regress_expected
index 4caabadeb..c8e075522 100644
--- a/regress/regress_expected
+++ b/regress/regress_expected
@@ -148,11 +148,18 @@ ERROR:  parse error - invalid geometry at character 23
 143|SRID=6;MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)))
 143c1|MULTICURVE(CIRCULARSTRING(0 0,1 1,2 2))
 144|POINTM(1 2 0)
+WARNING:  ST_Force_3dm signature was deprecated in 2.1.0. Please use ST_Force3DM
+144d|POINTM(1 2 0)
 145|POINT(1 2 0)
+WARNING:  ST_Force_3dz signature was deprecated in 2.1.0. Please use ST_Force3DZ
+145d|POINT(1 2 0)
 146|POINT(1 2 0 3)
 147|POINT(1 2 3 0)
+WARNING:  ST_Force_4d signature was deprecated in 2.1.0. Please use ST_Force4D
+147d|POINT(1 2 3 0)
 148|LINESTRING(0 0,5 0,10 0)
 149|GEOMETRYCOLLECTION EMPTY
+150d|SRID=6;GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)))
 150|SRID=6;GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)))
 151|01030000000100000005000000000000000000000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f000000000000f03f000000000000000000000000000000000000000000000000
 152|4326
diff --git a/regress/tickets_expected b/regress/tickets_expected
index c3273446d..766d8bfd1 100644
--- a/regress/tickets_expected
+++ b/regress/tickets_expected
@@ -145,7 +145,7 @@ ERROR:  First argument must be a LINESTRING
 #1273.1|t
 ERROR:  stats for "t.g" do not exist
 ERROR:  stats for "t.g" do not exist
-DEBUG:  ST_Estimated_Extent signature was deprecated in 2.1.0. Please use ST_EstimatedExtent
+WARNING:  ST_Estimated_Extent signature was deprecated in 2.1.0. Please use ST_EstimatedExtent
 ERROR:  stats for "t.g" do not exist
 ERROR:  stats for "t.g" do not exist
 #877.4|-10.15000|20.15000|-50.40000|30.40000