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 6264e763d84814bd1cbd38b4d7891ae445a1582f..655d0a62d318723cd1627b2c2fabe358456997e3 100644 (file)
--- 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 f6b295cb73af5be6df624820584c1e1880ea14ae..fdc19d3b70eaadb10cc39d4c2540eb3947b13023 100644 (file)
--- 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 ee8f2958f9a140a2abfe2367c4596b6a4209a517..1459524b443cc3eeff3828281da9836518d24baa 100644 (file)
--- 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