Drop (SRF()).* constructs (#956)

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

diff --git a/topology/sql/gml.sql.in.c b/topology/sql/gml.sql.in.c
index 11cb7f20cb9737600d35534365ed062a8346fd53..e3fdeb73e8c3cadf83aca9441744b74e13fd4f3c 100644 (file)
--- a/topology/sql/gml.sql.in.c
+++ b/topology/sql/gml.sql.in.c
@@ -192,7 +192,7 @@ BEGIN
 
   -- Construct the face geometry, then for each polygon:
   FOR rec IN SELECT (ST_DumpRings((ST_Dump(ST_ForceRHR(
-    topology.ST_GetFaceGeometry(toponame, face_id)))).geom)).*
+    topology.ST_GetFaceGeometry(toponame, face_id)))).geom)).geom
   LOOP
 
       -- Contents of a directed face are the list of edges

diff --git a/topology/sql/populate.sql.in.c b/topology/sql/populate.sql.in.c
index 4aab7ddc251e05f30fd983f823d49ffe8f0dc379..6146c9d3bd91037dc52549bf9502ac0b9795a1c9 100644 (file)
--- a/topology/sql/populate.sql.in.c
+++ b/topology/sql/populate.sql.in.c
@@ -401,7 +401,7 @@ BEGIN
     RAISE EXCEPTION 'Face geometry must be a polygon';
   END IF;
 
-  for rrec IN SELECT (ST_DumpRings(ST_ForceRHR(apoly))).*
+  for rrec IN SELECT (ST_DumpRings(ST_ForceRHR(apoly))).geom
   LOOP -- {
     --
     -- Find all bounds edges, forcing right-hand-rule

diff --git a/topology/sql/sqlmm.sql.in.c b/topology/sql/sqlmm.sql.in.c
index 8f8dfb93c40e56b9206f3b1d6976e7f9c48b3d90..3e654e3d47f8e5ba81304a79a386376bcd513960 100644 (file)
--- a/topology/sql/sqlmm.sql.in.c
+++ b/topology/sql/sqlmm.sql.in.c
@@ -65,7 +65,7 @@ BEGIN
 
   -- Construct the face geometry, then for each ring of each polygon:
   sql := 'SELECT (ST_DumpRings((ST_Dump(ST_ForceRHR('
-    || 'ST_BuildArea(ST_Collect(geom))))).geom)).* FROM '
+    || 'ST_BuildArea(ST_Collect(geom))))).geom)).geom FROM '
     || quote_ident(toponame) || '.edge_data WHERE left_face = '
     || face_id || ' OR right_face = ' || face_id;
   FOR rec IN EXECUTE sql