Additional sorting of rt_clip regression test. Ticket is #1848

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

diff --git a/raster/test/regress/rt_clip.sql b/raster/test/regress/rt_clip.sql
index 8ff0b3d1ed9ab6312c85bd5575b0b70068ab233c..d50eb31e6c8c2987c58587af18f51de2d7ced67c 100644 (file)
--- a/raster/test/regress/rt_clip.sql
+++ b/raster/test/regress/rt_clip.sql
@@ -96,7 +96,8 @@ SELECT 4, rid, gid, ST_Clip(rast, geom, ARRAY[255, 254, 253], true)
 FROM raster_clip, geom_clip;
 
 -- Display the metadata of the resulting rasters
-SELECT tid,
+SELECT
+       tid,
        rid,
        gid,
        round(upperleftx::numeric, 3) AS upperleftx,
@@ -121,20 +122,35 @@ FROM (
 ) AS r;
 
 -- Display the pixels and the values of the resulting rasters (raster 1)
-SELECT tid, rid, gid, (gvxy).x, (gvxy).y, (gvxy).val, ST_AsText((gvxy).geom) geom
+SELECT
+       tid,
+       rid,
+       gid,
+       (gvxy).x,
+       (gvxy).y,
+       (gvxy).val,
+       ST_AsText((gvxy).geom) geom
 FROM (SELECT tid, rid, gid, ST_PixelAsPolygons(rast) gvxy
       FROM raster_clip_out
       WHERE rid = 1
 ) foo
-ORDER BY 1, 2, 3, 4, 5;
+ORDER BY 1, 2, 3, 4, 5, 7;
 
 -- Display the pixels and the values of the resulting rasters (raster 2, 3 bands)
-SELECT tid, rid, gid, band, (gvxy).x, (gvxy).y, (gvxy).val, ST_AsText((gvxy).geom) geom
+SELECT
+       tid,
+       rid,
+       gid,
+       band,
+       (gvxy).x,
+       (gvxy).y,
+       (gvxy).val,
+       ST_AsText((gvxy).geom) geom
 FROM (SELECT tid, rid, gid, band, ST_PixelAsPolygons(rast, band) gvxy
       FROM raster_clip_out, generate_series(1, 3) band
       WHERE rid = 2
 ) foo
-ORDER BY 1, 2, 3, 4, 5;
+ORDER BY 1, 2, 3, 4, 5, 6, 8;
 
 DROP TABLE IF EXISTS geom_clip;
 DROP TABLE IF EXISTS raster_clip;