From: Pierre Racine <Pierre.Racine@sbf.ulaval.ca>
Date: Wed, 21 Aug 2013 21:45:18 +0000 (+0000)
Subject: Fixed more null cases.
X-Git-Tag: 2.2.0rc1~1396
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f7f83c4fefee5acfef1f61755248dca6d9e5907;p=postgis

Fixed more null cases.

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

diff --git a/raster/scripts/plpgsql/st_summarystatsagg.sql b/raster/scripts/plpgsql/st_summarystatsagg.sql
index 44c29ffde..32fda53e5 100644
--- a/raster/scripts/plpgsql/st_summarystatsagg.sql
+++ b/raster/scripts/plpgsql/st_summarystatsagg.sql
@@ -25,7 +25,7 @@ CREATE OR REPLACE FUNCTION raster_summarystatsstate(ss summarystats, rast raster
         newstats summarystats;
         ret summarystats;
     BEGIN
-        IF rast IS NULL THEN
+        IF rast IS NULL OR ST_HasNoBand(rast) OR ST_IsEmpty(rast) THEN
             RETURN ss;
         END IF;
         newstats := _ST_SummaryStats(rast, nband, exclude_nodata_value, sample_percent);
@@ -37,7 +37,7 @@ CREATE OR REPLACE FUNCTION raster_summarystatsstate(ss summarystats, rast raster
                     newstats.min, 
                     newstats.max)::summarystats;
         ELSE
-            ret := (ss.count + newstats.count, 
+            ret := (COALESCE(ss.count,0) + COALESCE(newstats.count, 0),
                     COALESCE(ss.sum,0) + COALESCE(newstats.sum, 0),
                     null,
                     null,