Put NULL safety tests back in now that Mark has fixed aggregate collection bug

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

diff --git a/doc/xsl/postgis_gardentest.sql.xsl b/doc/xsl/postgis_gardentest.sql.xsl
index cbd431cd51af89e69ef16c941f2773e70ea38f13..a50f08b6e01c838af34ca37dfd064a74bae6eb90 100644 (file)
--- a/doc/xsl/postgis_gardentest.sql.xsl
+++ b/doc/xsl/postgis_gardentest.sql.xsl
@@ -141,6 +141,8 @@
                        UNION ALL SELECT ST_GeomFromText('POLYGON EMPTY',4326) As the_geom\r
                )\r
                </pgis:gset>\r
+               <pgis:gset ID="NULL" GeometryType="GEOMETRY" createtable="false">(SELECT CAST(Null As geometry) As the_geom)</pgis:gset>\r
+\r
 \r
        <!-- TODO: Finish off MULTI list -->\r
        </pgis:gardens>\r
@@ -155,7 +157,6 @@
                                FROM generate_series(-10,50,10) As i\r
                                        CROSS JOIN generate_series(40,70, 20) As j\r
                                        ORDER BY i, j, i*j)</pgis:gset>\r
-               <pgis:gset ID="NULL" GeometryType="GEOMETRY" createtable="false">(SELECT CAST(Null As geometry) As the_geom)</pgis:gset>\r
 \r
        </pgis:gardencrashers>\r
 \r

diff --git a/doc/xsl/postgis_gardentest_subset.sql.xsl b/doc/xsl/postgis_gardentest_subset.sql.xsl
index b0a58fa9bc2fcbf10e8446f6d4c32a51f2f3eee7..550809a2217d7b73adf5c615037c988a47fab958 100644 (file)
--- a/doc/xsl/postgis_gardentest_subset.sql.xsl
+++ b/doc/xsl/postgis_gardentest_subset.sql.xsl
@@ -140,6 +140,9 @@
                        UNION ALL SELECT ST_GeomFromText('POLYGON EMPTY',4326) As the_geom\r
                )\r
                </pgis:gset>\r
+               \r
+               <pgis:gset ID="NULL" GeometryType="GEOMETRY" createtable="false">(SELECT CAST(Null As geometry) As the_geom)</pgis:gset>\r
+\r
 \r
        <!-- TODO: Finish off MULTI list -->\r
        </pgis:gardens>\r
@@ -154,8 +157,7 @@
                                FROM generate_series(-10,50,10) As i\r
                                        CROSS JOIN generate_series(40,70, 20) As j\r
                                        ORDER BY i, j, i*j)</pgis:gset>\r
-               <pgis:gset ID="NULL" GeometryType="GEOMETRY" createtable="false">(SELECT CAST(Null As geometry) As the_geom)</pgis:gset>\r
-\r
+       \r
        </pgis:gardencrashers>\r
 \r
        <xsl:template match='/chapter'>\r