Do not report "face without edges" error for universal face (#1612)

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

diff --git a/topology/test/regress/legacy_validate.sql b/topology/test/regress/legacy_validate.sql
index 77d22d5b42a76cdbf314fa3143f9acf39b1b9cb9..d325e706f9d40c02b9405f4dc3cabd17353fd054 100644 (file)
--- a/topology/test/regress/legacy_validate.sql
+++ b/topology/test/regress/legacy_validate.sql
@@ -5,3 +5,8 @@ set client_min_messages to WARNING;
 
 -- clean up
 SELECT topology.DropTopology('city_data');
+
+-- Test for #1612
+SELECT CreateTopology('tt') > 0;
+SELECT 'Empty topology errors', count(*) FROM ValidateTopology('tt');
+SELECT DropTopology('tt');

diff --git a/topology/test/regress/legacy_validate_expected b/topology/test/regress/legacy_validate_expected
index 24c43935013c0d5cc23207dd0a8fd7be761fe3c9..7d163181843fb2a50cfb4cdaaa8a0f20cfbde4d5 100644 (file)
--- a/topology/test/regress/legacy_validate_expected
+++ b/topology/test/regress/legacy_validate_expected
@@ -7,3 +7,6 @@ COMMIT
 Topology validation errors follow:
 End of topology validation errors
 Topology 'city_data' dropped
+t
+Empty topology errors|0
+Topology 'tt' dropped

diff --git a/topology/topology.sql.in.c b/topology/topology.sql.in.c
index fcd8ec1b963c5ef31265854d1a9b0d99c64357aa..1c6edf4c0c1759b9a2d5d29a8dda4992b883d891 100644 (file)
--- a/topology/topology.sql.in.c
+++ b/topology/topology.sql.in.c
@@ -1492,7 +1492,7 @@ BEGIN
   -- Check for faces w/out edges
   FOR rec IN EXECUTE 'SELECT face_id as id1 FROM '
     || quote_ident(toponame) || '.face '
-    || 'EXCEPT ( SELECT left_face FROM '
+    || 'WHERE face_id > 0 EXCEPT ( SELECT left_face FROM '
     || quote_ident(toponame) || '.edge '
     || ' UNION SELECT right_face FROM '
     || quote_ident(toponame) || '.edge '