Tweak TopologySummary output to count all layers (not only populated ones)

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

diff --git a/topology/sql/manage/TopologySummary.sql.in b/topology/sql/manage/TopologySummary.sql.in
index 78085c741550eff36cc6f30491eafc849abf7bbd..b493716b96820f220f9c7615c76550053ad7754c 100644 (file)
--- a/topology/sql/manage/TopologySummary.sql.in
+++ b/topology/sql/manage/TopologySummary.sql.in
@@ -79,10 +79,10 @@ BEGIN
 
     EXECUTE 'SELECT count(*) FROM (SELECT DISTINCT layer_id,topogeo_id FROM '
       || quote_ident(atopology) || '.relation ) foo ' INTO STRICT n;
-    ret = ret || n || ' topogeoms in ';
+    ret = ret || n || ' topogeoms, ';
 
-    EXECUTE 'SELECT count(*) FROM (SELECT DISTINCT layer_id FROM '
-      || quote_ident(atopology) || '.relation ) foo ' INTO STRICT n;
+    EXECUTE 'SELECT count(layer_id) FROM topology.layer WHERE topology_id = '
+      || rec.id INTO STRICT n;
     ret = ret || n || ' layers' || E'\n';
   EXCEPTION
     WHEN UNDEFINED_TABLE OR INVALID_SCHEMA_NAME THEN