From 1198c42fe9d2808ab4101f3e906fb4cd8757102c Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Mon, 5 Oct 2015 16:26:25 +0000 Subject: [PATCH] #3314 missed some spots forcing order of results git-svn-id: http://svn.osgeo.org/postgis/trunk@14193 b70326c6-7e19-0410-871a-916f4a2858ee --- raster/test/regress/rt_mapalgebra_mask.sql | 24 +++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/raster/test/regress/rt_mapalgebra_mask.sql b/raster/test/regress/rt_mapalgebra_mask.sql index d4aaeae17..1a3e9dab5 100644 --- a/raster/test/regress/rt_mapalgebra_mask.sql +++ b/raster/test/regress/rt_mapalgebra_mask.sql @@ -42,19 +42,33 @@ select st_mapalgebra(rast,1,'raster_nmapalgebra_test(double precision[], int[], select st_mapalgebra(rast,1,'raster_nmapalgebra_test(double precision[], int[], text[])'::regprocedure,ARRAY[[1,1,1,1],[1,1,1,1],[1,1,1,1],[1,1,1,1]]::double precision[],false) from raster_nmapalgebra_mask_in; -select rid, st_dumpvalues(st_mapalgebra(rast,1,'raster_nmapalgebra_test(double precision[], int[], text[])'::regprocedure,NULL::double precision[],false)) from raster_nmapalgebra_mask_in; +SELECT * +FROM (SELECT rid, st_dumpvalues(st_mapalgebra(rast,1,'raster_nmapalgebra_test(double precision[], int[], text[])'::regprocedure,NULL::double precision[],false)) AS dv +from raster_nmapalgebra_mask_in) As f +ORDER BY rid, (dv).nband; select st_mapalgebra(rast,1,'raster_nmapalgebra_test(double precision[], int[], text[])'::regprocedure,ARRAY[NULL]::double precision[],false) from raster_nmapalgebra_mask_in; select st_mapalgebra(rast,1,'raster_nmapalgebra_test(double precision[], int[], text[])'::regprocedure,ARRAY[1]::double precision[],false) from raster_nmapalgebra_mask_in; -select rid, st_dumpvalues(st_mapalgebra(rast,1,'raster_nmapalgebra_test(double precision[], int[], text[])'::regprocedure,ARRAY[[1]]::double precision[],false)) from raster_nmapalgebra_mask_in; +SELECT * +FROM (SELECT rid, st_dumpvalues(st_mapalgebra(rast,1,'raster_nmapalgebra_test(double precision[], int[], text[])'::regprocedure,ARRAY[[1]]::double precision[],false)) AS dv from raster_nmapalgebra_mask_in ) As f +ORDER BY rid, (dv).nband; -select rid, st_dumpvalues(st_mapalgebra(rast,1,'raster_nmapalgebra_test(double precision[], int[], text[])'::regprocedure,ARRAY[[NULL]]::double precision[],false)) from raster_nmapalgebra_mask_in; +SELECT * +FROM (SELECT rid, st_dumpvalues(st_mapalgebra(rast,1,'raster_nmapalgebra_test(double precision[], int[], text[])'::regprocedure,ARRAY[[NULL]]::double precision[],false)) AS dv +from raster_nmapalgebra_mask_in) AS f +ORDER BY rid, (dv).nband; -select rid, st_dumpvalues(st_mapalgebra(rast,1,'raster_nmapalgebra_test(double precision[], int[], text[])'::regprocedure,ARRAY[[1,1,1],[1,1,1],[1,1,1]]::double precision[],false)) from raster_nmapalgebra_mask_in; +SELECT * +FROM (SELECT rid, st_dumpvalues(st_mapalgebra(rast,1,'raster_nmapalgebra_test(double precision[], int[], text[])'::regprocedure,ARRAY[[1,1,1],[1,1,1],[1,1,1]]::double precision[],false)) AS dv + from raster_nmapalgebra_mask_in) AS f +ORDER BY rid, (dv).nband; -select rid, st_dumpvalues(st_mapalgebra(rast,1,'raster_nmapalgebra_test(double precision[], int[], text[])'::regprocedure,ARRAY[[1,0,0],[0,0,0],[0,0,0]]::double precision[],false)) from raster_nmapalgebra_mask_in; +SELECT * +FROM (SELECT rid, st_dumpvalues(st_mapalgebra(rast,1,'raster_nmapalgebra_test(double precision[], int[], text[])'::regprocedure,ARRAY[[1,0,0],[0,0,0],[0,0,0]]::double precision[],false)) AS dv + from raster_nmapalgebra_mask_in) AS f +ORDER BY rid, (dv).nband; -- 2.40.0