From: Sandro Santilli Date: Thu, 29 Dec 2011 10:52:17 +0000 (+0000) Subject: CreateTopoGeom: tweak error message on out-of-range TopoGeometry type X-Git-Tag: 2.0.0alpha1~264 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79ce7227cfce27072c720e594a0c26bba02363d2;p=postgis CreateTopoGeom: tweak error message on out-of-range TopoGeometry type git-svn-id: http://svn.osgeo.org/postgis/trunk@8611 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/topology/test/regress/createtopogeom.sql b/topology/test/regress/createtopogeom.sql index 6264e763d..655d0a62d 100644 --- a/topology/test/regress/createtopogeom.sql +++ b/topology/test/regress/createtopogeom.sql @@ -30,4 +30,8 @@ SELECT layer_id(tg), id(tg), type(tg) FROM ( SELECT topology.CreateTopoGeom( 'MiX', 1, 1, '{{1,1}}') as tg ) foo; +-- Invalid TopoGeometry type (out of range) +SELECT topology.CreateTopoGeom( 'MiX', 5, 1, '{{12,2}}'); +SELECT topology.CreateTopoGeom( 'MiX', 0, 1, '{{12,2}}'); + SELECT topology.DropTopology('MiX'); diff --git a/topology/test/regress/createtopogeom_expected b/topology/test/regress/createtopogeom_expected index f6b295cb7..fdc19d3b7 100644 --- a/topology/test/regress/createtopogeom_expected +++ b/topology/test/regress/createtopogeom_expected @@ -7,4 +7,6 @@ ERROR: A Layer of type 1 cannot contain a TopoGeometry of type 4 ERROR: Node 78 does not exist in topology MiX n1|1 1|2|1 +ERROR: Invalid TopoGeometry type 5 (must be in the range 1..4) +ERROR: Invalid TopoGeometry type 0 (must be in the range 1..4) Topology 'MiX' dropped diff --git a/topology/topology.sql.in.c b/topology/topology.sql.in.c index ee8f2958f..1459524b4 100644 --- a/topology/topology.sql.in.c +++ b/topology/topology.sql.in.c @@ -859,7 +859,7 @@ DECLARE BEGIN IF tg_type < 1 OR tg_type > 4 THEN - RAISE EXCEPTION 'Invalid TopoGeometry type (must be in the range 1..4'; + RAISE EXCEPTION 'Invalid TopoGeometry type % (must be in the range 1..4)', tg_type; END IF; -- Get topology id into return TopoGeometry