Make test more readable

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

diff --git a/raster/test/regress/rt_mapalgebraexpr.sql b/raster/test/regress/rt_mapalgebraexpr.sql
index be0dc1a0562423377c8cc7c4b09f616a516112d3..dc28f29697cc10d0e8b53472f1a8c8ab427added 100644 (file)
--- a/raster/test/regress/rt_mapalgebraexpr.sql
+++ b/raster/test/regress/rt_mapalgebraexpr.sql
@@ -31,5 +31,11 @@ FROM ST_TestRaster(0, 0, 10) rast,
 ORDER BY x, y;
 
 -- Test evaluations to null (see #1523)
-SELECT 'T11.1', ST_Value(rast, 1, 1), ST_Value(ST_MapAlgebraExpr(rast, 1, NULL, 'g from (select NULL as g) as foo', 2), 1, 1) FROM ST_TestRaster(0, 0, 10) rast;
-SELECT 'T11.2', ST_Value(rast, 1, 1), ST_Value(ST_MapAlgebraExpr(rast, 1, NULL, 'g from (select RAST,NULL as g) as foo', 2), 1, 1) FROM ST_TestRaster(0, 0, 10) rast;
+WITH op AS ( select rast AS rin,
+  ST_MapAlgebraExpr(rast, 1, NULL, 'g from (select NULL as g) as foo', 2)
+  AS rout FROM ST_TestRaster(0, 0, 10) rast )
+SELECT 'T11.1', ST_Value(rin, 1, 1), ST_Value(rout, 1, 1) FROM op;
+WITH op AS ( select rast AS rin,
+  ST_MapAlgebraExpr(rast, 1, NULL, 'g from (select RAST,NULL as g) as foo', 2)
+  AS rout FROM ST_TestRaster(0, 0, 10) rast )
+SELECT 'T11.2', ST_Value(rin, 1, 1), ST_Value(rout, 1, 1) FROM op;