Added default values for function parameters of ST_SummaryStats, ST_Count, ST_Sum...

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

diff --git a/raster/rt_pg/rtpostgis.sql.in.c b/raster/rt_pg/rtpostgis.sql.in.c
index a80d6d0379a0ab7fbf18f06863b1cc5e531a0542..ae446630c597fef761285ac694af2e8774c8d57c 100644 (file)
--- a/raster/rt_pg/rtpostgis.sql.in.c
+++ b/raster/rt_pg/rtpostgis.sql.in.c
@@ -233,7 +233,7 @@ CREATE OR REPLACE FUNCTION st_addband(torast raster, fromrast raster)
 -----------------------------------------------------------------------
 -- Constructor ST_Band
 -----------------------------------------------------------------------
-CREATE OR REPLACE FUNCTION st_band(rast raster, nbands int[] default ARRAY[1])
+CREATE OR REPLACE FUNCTION st_band(rast raster, nbands int[] DEFAULT ARRAY[1])
        RETURNS RASTER
        AS 'MODULE_PATHNAME', 'RASTER_band'
        LANGUAGE 'C' IMMUTABLE STRICT;
@@ -243,15 +243,17 @@ CREATE OR REPLACE FUNCTION st_band(rast raster, nband int)
        AS $$ SELECT st_band($1, ARRAY[$2]) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_band(rast raster, nbands text)
+CREATE OR REPLACE FUNCTION st_band(rast raster, nbands text, delimiter char DEFAULT ',')
        RETURNS RASTER
-       AS $$ SELECT st_band($1, regexp_split_to_array(regexp_replace($2, '[[:space:]]', '', 'g'), ',')::int[]) $$
+       AS $$ SELECT st_band($1, regexp_split_to_array(regexp_replace($2, '[[:space:]]', '', 'g'), $3)::int[]) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_band(rast raster, nbands text, delimiter char)
+/*
+CREATE OR REPLACE FUNCTION st_band(rast raster, nbands text)
        RETURNS RASTER
-       AS $$ SELECT st_band($1, regexp_split_to_array(regexp_replace($2, '[[:space:]]', '', 'g'), $3)::int[]) $$
+       AS $$ SELECT st_band($1, regexp_split_to_array(regexp_replace($2, '[[:space:]]', '', 'g'), ',')::int[]) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
+*/
 
 -----------------------------------------------------------------------
 -- ST_SummaryStats and ST_ApproxSummaryStats
@@ -265,57 +267,63 @@ CREATE TYPE summarystats AS (
        max double precision
 );
 
-CREATE OR REPLACE FUNCTION _st_summarystats(rast raster, nband int, hasnodata boolean, sample_percent double precision)
+CREATE OR REPLACE FUNCTION st_summarystats(rast raster, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, sample_percent double precision DEFAULT 1)
        RETURNS summarystats
        AS 'MODULE_PATHNAME','RASTER_summaryStats'
        LANGUAGE 'C' IMMUTABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_summarystats(rast raster, nband int, hasnodata boolean)
        RETURNS summarystats
-       AS $$ SELECT count, sum, mean, stddev, min, max FROM _st_summarystats($1, $2, $3, 1) $$
+       AS $$ SELECT count, sum, mean, stddev, min, max FROM st_summarystats($1, $2, $3, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_summarystats(rast raster, nband int)
        RETURNS summarystats
-       AS $$ SELECT count, sum, mean, stddev, min, max FROM _st_summarystats($1, $2, TRUE, 1) $$
+       AS $$ SELECT count, sum, mean, stddev, min, max FROM st_summarystats($1, $2, TRUE, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
+*/
 
 CREATE OR REPLACE FUNCTION st_summarystats(rast raster, hasnodata boolean)
        RETURNS summarystats
-       AS $$ SELECT count, sum, mean, stddev, min, max FROM _st_summarystats($1, 1, $2, 1) $$
+       AS $$ SELECT count, sum, mean, stddev, min, max FROM st_summarystats($1, 1, $2, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_summarystats(rast raster)
        RETURNS summarystats
-       AS $$ SELECT count, sum, mean, stddev, min, max FROM _st_summarystats($1, 1, TRUE, 1) $$
+       AS $$ SELECT count, sum, mean, stddev, min, max FROM st_summarystats($1, 1, TRUE, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
+*/
 
-CREATE OR REPLACE FUNCTION st_approxsummarystats(rast raster, nband int, hasnodata boolean, sample_percent double precision)
+CREATE OR REPLACE FUNCTION st_approxsummarystats(rast raster, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, sample_percent double precision DEFAULT 0.1)
        RETURNS summarystats
-       AS $$ SELECT count, sum, mean, stddev, min, max FROM _st_summarystats($1, $2, $3, $4) $$
+       AS $$ SELECT count, sum, mean, stddev, min, max FROM st_summarystats($1, $2, $3, $4) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxsummarystats(rast raster, nband int, sample_percent double precision)
        RETURNS summarystats
-       AS $$ SELECT count, sum, mean, stddev, min, max FROM _st_summarystats($1, $2, TRUE, $3) $$
+       AS $$ SELECT count, sum, mean, stddev, min, max FROM st_summarystats($1, $2, TRUE, $3) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_approxsummarystats(rast raster, hasnodata boolean, sample_percent double precision)
+CREATE OR REPLACE FUNCTION st_approxsummarystats(rast raster, hasnodata boolean, sample_percent double precision DEFAULT 0.1)
        RETURNS summarystats
-       AS $$ SELECT count, sum, mean, stddev, min, max FROM _st_summarystats($1, 1, $2, $3) $$
+       AS $$ SELECT count, sum, mean, stddev, min, max FROM st_summarystats($1, 1, $2, $3) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxsummarystats(rast raster, sample_percent double precision)
        RETURNS summarystats
-       AS $$ SELECT count, sum, mean, stddev, min, max FROM _st_summarystats($1, 1, TRUE, $2) $$
+       AS $$ SELECT count, sum, mean, stddev, min, max FROM st_summarystats($1, 1, TRUE, $2) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_approxsummarystats(rast raster)
        RETURNS summarystats
-       AS $$ SELECT count, sum, mean, stddev, min, max FROM _st_summarystats($1, 1, TRUE, 0.1) $$
+       AS $$ SELECT count, sum, mean, stddev, min, max FROM st_summarystats($1, 1, TRUE, 0.1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
+*/
 
-CREATE OR REPLACE FUNCTION _st_summarystats(rastertable text, rastercolumn text, nband integer, hasnodata boolean, sample_percent double precision)
+CREATE OR REPLACE FUNCTION st_summarystats(rastertable text, rastercolumn text, nband integer DEFAULT 1, hasnodata boolean DEFAULT TRUE, sample_percent double precision DEFAULT 1)
        RETURNS summarystats
        AS $$
        DECLARE
@@ -368,7 +376,7 @@ CREATE OR REPLACE FUNCTION _st_summarystats(rastertable text, rastercolumn text,
                        FETCH curs INTO rast;
                        EXIT WHEN NOT FOUND;
 
-                       SELECT count, sum, mean, stddev, min, max FROM _st_summarystats(rast, nband, hasnodata, sample_percent) INTO stats;
+                       SELECT count, sum, mean, stddev, min, max FROM st_summarystats(rast, nband, hasnodata, sample_percent) INTO stats;
                        IF stats IS NULL OR stats.count < 1 THEN
                                CONTINUE;
                        END IF;
@@ -413,510 +421,576 @@ CREATE OR REPLACE FUNCTION _st_summarystats(rastertable text, rastercolumn text,
        END;
        $$ LANGUAGE 'plpgsql' STABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_summarystats(rastertable text, rastercolumn text, nband integer, hasnodata boolean)
        RETURNS summarystats
-       AS $$ SELECT count, sum, mean, stddev, min, max FROM _st_summarystats($1, $2, $3, $4, 1) $$
+       AS $$ SELECT count, sum, mean, stddev, min, max FROM st_summarystats($1, $2, $3, $4, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_summarystats(rastertable text, rastercolumn text, nband integer)
        RETURNS summarystats
-       AS $$ SELECT count, sum, mean, stddev, min, max FROM _st_summarystats($1, $2, $3, TRUE, 1) $$
+       AS $$ SELECT count, sum, mean, stddev, min, max FROM st_summarystats($1, $2, $3, TRUE, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_summarystats(rastertable text, rastercolumn text)
        RETURNS summarystats
-       AS $$ SELECT count, sum, mean, stddev, min, max FROM _st_summarystats($1, $2, 1, TRUE, 1) $$
+       AS $$ SELECT count, sum, mean, stddev, min, max FROM st_summarystats($1, $2, 1, TRUE, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
+*/
 
-CREATE OR REPLACE FUNCTION st_approxsummarystats(rastertable text, rastercolumn text, nband integer, hasnodata boolean, sample_percent double precision)
+CREATE OR REPLACE FUNCTION st_approxsummarystats(rastertable text, rastercolumn text, nband integer DEFAULT 1, hasnodata boolean DEFAULT TRUE, sample_percent double precision DEFAULT 0.1)
        RETURNS summarystats
-       AS $$ SELECT count, sum, mean, stddev, min, max FROM _st_summarystats($1, $2, $3, $4, $5) $$
+       AS $$ SELECT count, sum, mean, stddev, min, max FROM st_summarystats($1, $2, $3, $4, $5) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxsummarystats(rastertable text, rastercolumn text, nband integer, sample_percent double precision)
        RETURNS summarystats
-       AS $$ SELECT count, sum, mean, stddev, min, max FROM _st_summarystats($1, $2, $3, TRUE, $4) $$
+       AS $$ SELECT count, sum, mean, stddev, min, max FROM st_summarystats($1, $2, $3, TRUE, $4) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_approxsummarystats(rastertable text, rastercolumn text, nband integer)
        RETURNS summarystats
-       AS $$ SELECT count, sum, mean, stddev, min, max FROM _st_summarystats($1, $2, $3, TRUE, 0.1) $$
+       AS $$ SELECT count, sum, mean, stddev, min, max FROM st_summarystats($1, $2, $3, TRUE, 0.1) $$
        LANGUAGE 'SQL' STABLE STRICT;
+*/
 
 CREATE OR REPLACE FUNCTION st_approxsummarystats(rastertable text, rastercolumn text, sample_percent double precision)
        RETURNS summarystats
-       AS $$ SELECT count, sum, mean, stddev, min, max FROM _st_summarystats($1, $2, 1, TRUE, $3) $$
+       AS $$ SELECT count, sum, mean, stddev, min, max FROM st_summarystats($1, $2, 1, TRUE, $3) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_approxsummarystats(rastertable text, rastercolumn text)
        RETURNS summarystats
-       AS $$ SELECT count, sum, mean, stddev, min, max FROM _st_summarystats($1, $2, 1, TRUE, 0.1) $$
+       AS $$ SELECT count, sum, mean, stddev, min, max FROM st_summarystats($1, $2, 1, TRUE, 0.1) $$
        LANGUAGE 'SQL' STABLE STRICT;
+*/
 
 -----------------------------------------------------------------------
 -- ST_Count and ST_ApproxCount
 -----------------------------------------------------------------------
-CREATE OR REPLACE FUNCTION st_count(rast raster, nband int, hasnodata boolean, OUT count bigint)
+CREATE OR REPLACE FUNCTION st_count(rast raster, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, OUT count bigint)
        RETURNS bigint
-       AS $$ SELECT count FROM _st_summarystats($1, $2, $3, 1) $$
+       AS $$ SELECT count FROM st_summarystats($1, $2, $3, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_count(rast raster, nband int, OUT count bigint)
        RETURNS bigint
-       AS $$ SELECT count FROM _st_summarystats($1, $2, TRUE, 1) $$
+       AS $$ SELECT count FROM st_summarystats($1, $2, TRUE, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
+*/
 
 CREATE OR REPLACE FUNCTION st_count(rast raster, hasnodata boolean, OUT count bigint)
        RETURNS bigint
-       AS $$ SELECT count FROM _st_summarystats($1, 1, $2, 1) $$
+       AS $$ SELECT count FROM st_summarystats($1, 1, $2, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_count(rast raster, OUT count bigint)
        RETURNS bigint
-       AS $$ SELECT count FROM _st_summarystats($1, 1, TRUE, 1) $$
+       AS $$ SELECT count FROM st_summarystats($1, 1, TRUE, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
+*/
 
-CREATE OR REPLACE FUNCTION st_approxcount(rast raster, nband int, hasnodata boolean, sample_percent double precision, OUT count bigint)
+CREATE OR REPLACE FUNCTION st_approxcount(rast raster, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, sample_percent double precision DEFAULT 0.1, OUT count bigint)
        RETURNS bigint
-       AS $$ SELECT count FROM _st_summarystats($1, $2, $3, $4) $$
+       AS $$ SELECT count FROM st_summarystats($1, $2, $3, $4) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxcount(rast raster, nband int, sample_percent double precision, OUT count bigint)
        RETURNS bigint
-       AS $$ SELECT count FROM _st_summarystats($1, $2, TRUE, $3) $$
+       AS $$ SELECT count FROM st_summarystats($1, $2, TRUE, $3) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_approxcount(rast raster, hasnodata boolean, sample_percent double precision, OUT count bigint)
+CREATE OR REPLACE FUNCTION st_approxcount(rast raster, hasnodata boolean, sample_percent double precision DEFAULT 0.1, OUT count bigint)
        RETURNS bigint
-       AS $$ SELECT count FROM _st_summarystats($1, 1, $2, $3) $$
+       AS $$ SELECT count FROM st_summarystats($1, 1, $2, $3) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxcount(rast raster, sample_percent double precision, OUT count bigint)
        RETURNS bigint
-       AS $$ SELECT count FROM _st_summarystats($1, 1, TRUE, $2) $$
+       AS $$ SELECT count FROM st_summarystats($1, 1, TRUE, $2) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_approxcount(rast raster, OUT count bigint)
        RETURNS bigint
-       AS $$ SELECT count FROM _st_summarystats($1, 1, TRUE, 0.1) $$
+       AS $$ SELECT count FROM st_summarystats($1, 1, TRUE, 0.1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
+*/
 
-CREATE OR REPLACE FUNCTION st_count(rastertable text, rastercolumn text, nband int, hasnodata boolean, OUT count bigint)
+CREATE OR REPLACE FUNCTION st_count(rastertable text, rastercolumn text, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, OUT count bigint)
        RETURNS bigint
-       AS $$ SELECT count FROM _st_summarystats($1, $2, $3, $4, 1) $$
+       AS $$ SELECT count FROM st_summarystats($1, $2, $3, $4, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_count(rastertable text, rastercolumn text, nband int, OUT count bigint)
        RETURNS bigint
-       AS $$ SELECT count FROM _st_summarystats($1, $2, $3, TRUE, 1) $$
+       AS $$ SELECT count FROM st_summarystats($1, $2, $3, TRUE, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
+*/
 
 CREATE OR REPLACE FUNCTION st_count(rastertable text, rastercolumn text, hasnodata boolean, OUT count bigint)
        RETURNS bigint
-       AS $$ SELECT count FROM _st_summarystats($1, $2, 1, $3, 1) $$
+       AS $$ SELECT count FROM st_summarystats($1, $2, 1, $3, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_count(rastertable text, rastercolumn text, OUT count bigint)
        RETURNS bigint
-       AS $$ SELECT count FROM _st_summarystats($1, $2, 1, TRUE, 1) $$
+       AS $$ SELECT count FROM st_summarystats($1, $2, 1, TRUE, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
+*/
 
-CREATE OR REPLACE FUNCTION st_approxcount(rastertable text, rastercolumn text, nband int, hasnodata boolean, sample_percent double precision, OUT count bigint)
+CREATE OR REPLACE FUNCTION st_approxcount(rastertable text, rastercolumn text, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, sample_percent double precision DEFAULT 0.1, OUT count bigint)
        RETURNS bigint
-       AS $$ SELECT count FROM _st_summarystats($1, $2, $3, $4, $5) $$
+       AS $$ SELECT count FROM st_summarystats($1, $2, $3, $4, $5) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxcount(rastertable text, rastercolumn text, nband int, sample_percent double precision, OUT count bigint)
        RETURNS bigint
-       AS $$ SELECT count FROM _st_summarystats($1, $2, $3, TRUE, $4) $$
+       AS $$ SELECT count FROM st_summarystats($1, $2, $3, TRUE, $4) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_approxcount(rastertable text, rastercolumn text, hasnodata boolean, sample_percent double precision, OUT count bigint)
+CREATE OR REPLACE FUNCTION st_approxcount(rastertable text, rastercolumn text, hasnodata boolean, sample_percent double precision DEFAULT 0.1, OUT count bigint)
        RETURNS bigint
-       AS $$ SELECT count FROM _st_summarystats($1, $2, 1, $3, $4) $$
+       AS $$ SELECT count FROM st_summarystats($1, $2, 1, $3, $4) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxcount(rastertable text, rastercolumn text, sample_percent double precision, OUT count bigint)
        RETURNS bigint
-       AS $$ SELECT count FROM _st_summarystats($1, $2, 1, TRUE, $3) $$
+       AS $$ SELECT count FROM st_summarystats($1, $2, 1, TRUE, $3) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_approxcount(rastertable text, rastercolumn text, OUT count bigint)
        RETURNS bigint
-       AS $$ SELECT count FROM _st_summarystats($1, $2, 1, TRUE, 0.1) $$
+       AS $$ SELECT count FROM st_summarystats($1, $2, 1, TRUE, 0.1) $$
        LANGUAGE 'SQL' STABLE STRICT;
+*/
 
 -----------------------------------------------------------------------
 -- ST_Sum and ST_ApproxSum
 -----------------------------------------------------------------------
-CREATE OR REPLACE FUNCTION st_sum(rast raster, nband int, hasnodata boolean, OUT sum double precision)
+CREATE OR REPLACE FUNCTION st_sum(rast raster, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, OUT sum double precision)
        RETURNS double precision
-       AS $$ SELECT sum FROM _st_summarystats($1, $2, $3, 1) $$
+       AS $$ SELECT sum FROM st_summarystats($1, $2, $3, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_sum(rast raster, nband int, OUT sum double precision)
        RETURNS double precision
-       AS $$ SELECT sum FROM _st_summarystats($1, $2, TRUE, 1) $$
+       AS $$ SELECT sum FROM st_summarystats($1, $2, TRUE, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
+*/
 
 CREATE OR REPLACE FUNCTION st_sum(rast raster, hasnodata boolean, OUT sum double precision)
        RETURNS double precision
-       AS $$ SELECT sum FROM _st_summarystats($1, 1, $2, 1) $$
+       AS $$ SELECT sum FROM st_summarystats($1, 1, $2, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_sum(rast raster, OUT sum double precision)
        RETURNS double precision
-       AS $$ SELECT sum FROM _st_summarystats($1, 1, TRUE, 1) $$
+       AS $$ SELECT sum FROM st_summarystats($1, 1, TRUE, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
+*/
 
-CREATE OR REPLACE FUNCTION st_approxsum(rast raster, nband int, hasnodata boolean, sample_percent double precision, OUT sum double precision)
+CREATE OR REPLACE FUNCTION st_approxsum(rast raster, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, sample_percent double precision DEFAULT 0.1, OUT sum double precision)
        RETURNS double precision
-       AS $$ SELECT sum FROM _st_summarystats($1, $2, $3, $4) $$
+       AS $$ SELECT sum FROM st_summarystats($1, $2, $3, $4) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxsum(rast raster, nband int, sample_percent double precision, OUT sum double precision)
        RETURNS double precision
-       AS $$ SELECT sum FROM _st_summarystats($1, $2, TRUE, $3) $$
+       AS $$ SELECT sum FROM st_summarystats($1, $2, TRUE, $3) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_approxsum(rast raster, hasnodata boolean, sample_percent double precision, OUT sum double precision)
+CREATE OR REPLACE FUNCTION st_approxsum(rast raster, hasnodata boolean, sample_percent double precision DEFAULT 0.1, OUT sum double precision)
        RETURNS double precision
-       AS $$ SELECT sum FROM _st_summarystats($1, 1, $2, $3) $$
+       AS $$ SELECT sum FROM st_summarystats($1, 1, $2, $3) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxsum(rast raster, sample_percent double precision, OUT sum double precision)
        RETURNS double precision
-       AS $$ SELECT sum FROM _st_summarystats($1, 1, TRUE, $2) $$
+       AS $$ SELECT sum FROM st_summarystats($1, 1, TRUE, $2) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_approxsum(rast raster, OUT sum double precision)
        RETURNS double precision
-       AS $$ SELECT sum FROM _st_summarystats($1, 1, TRUE, 0.1) $$
+       AS $$ SELECT sum FROM st_summarystats($1, 1, TRUE, 0.1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
+*/
 
-CREATE OR REPLACE FUNCTION st_sum(rastertable text, rastercolumn text, nband int, hasnodata boolean, OUT sum double precision)
+CREATE OR REPLACE FUNCTION st_sum(rastertable text, rastercolumn text, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, OUT sum double precision)
        RETURNS double precision
-       AS $$ SELECT sum FROM _st_summarystats($1, $2, $3, $4, 1) $$
+       AS $$ SELECT sum FROM st_summarystats($1, $2, $3, $4, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_sum(rastertable text, rastercolumn text, nband int, OUT sum double precision)
        RETURNS double precision
-       AS $$ SELECT sum FROM _st_summarystats($1, $2, $3, TRUE, 1) $$
+       AS $$ SELECT sum FROM st_summarystats($1, $2, $3, TRUE, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
+*/
 
 CREATE OR REPLACE FUNCTION st_sum(rastertable text, rastercolumn text, hasnodata boolean, OUT sum double precision)
        RETURNS double precision
-       AS $$ SELECT sum FROM _st_summarystats($1, $2, 1, $3, 1) $$
+       AS $$ SELECT sum FROM st_summarystats($1, $2, 1, $3, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_sum(rastertable text, rastercolumn text, OUT sum double precision)
        RETURNS double precision
-       AS $$ SELECT sum FROM _st_summarystats($1, $2, 1, TRUE, 1) $$
+       AS $$ SELECT sum FROM st_summarystats($1, $2, 1, TRUE, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
+*/
 
-CREATE OR REPLACE FUNCTION st_approxsum(rastertable text, rastercolumn text, nband int, hasnodata boolean, sample_percent double precision, OUT sum double precision)
+CREATE OR REPLACE FUNCTION st_approxsum(rastertable text, rastercolumn text, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, sample_percent double precision DEFAULT 0.1, OUT sum double precision)
        RETURNS double precision
-       AS $$ SELECT sum FROM _st_summarystats($1, $2, $3, $4, $5) $$
+       AS $$ SELECT sum FROM st_summarystats($1, $2, $3, $4, $5) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxsum(rastertable text, rastercolumn text, nband int, sample_percent double precision, OUT sum double precision)
        RETURNS double precision
-       AS $$ SELECT sum FROM _st_summarystats($1, $2, $3, TRUE, $4) $$
+       AS $$ SELECT sum FROM st_summarystats($1, $2, $3, TRUE, $4) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_approxsum(rastertable text, rastercolumn text, hasnodata boolean, sample_percent double precision, OUT sum double precision)
+CREATE OR REPLACE FUNCTION st_approxsum(rastertable text, rastercolumn text, hasnodata boolean, sample_percent double precision DEFAULT 0.1, OUT sum double precision)
        RETURNS double precision
-       AS $$ SELECT sum FROM _st_summarystats($1, $2, 1, $3, $4) $$
+       AS $$ SELECT sum FROM st_summarystats($1, $2, 1, $3, $4) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxsum(rastertable text, rastercolumn text, sample_percent double precision, OUT sum double precision)
        RETURNS double precision
-       AS $$ SELECT sum FROM _st_summarystats($1, $2, 1, TRUE, $3) $$
+       AS $$ SELECT sum FROM st_summarystats($1, $2, 1, TRUE, $3) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_approxsum(rastertable text, rastercolumn text, OUT sum double precision)
        RETURNS double precision
-       AS $$ SELECT sum FROM _st_summarystats($1, $2, 1, TRUE, 0.1) $$
+       AS $$ SELECT sum FROM st_summarystats($1, $2, 1, TRUE, 0.1) $$
        LANGUAGE 'SQL' STABLE STRICT;
+*/
 
 -----------------------------------------------------------------------
 -- ST_Mean and ST_ApproxMean
 -----------------------------------------------------------------------
-CREATE OR REPLACE FUNCTION st_mean(rast raster, nband int, hasnodata boolean, OUT mean double precision)
+CREATE OR REPLACE FUNCTION st_mean(rast raster, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, OUT mean double precision)
        RETURNS double precision
-       AS $$ SELECT mean FROM _st_summarystats($1, $2, $3, 1) $$
+       AS $$ SELECT mean FROM st_summarystats($1, $2, $3, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_mean(rast raster, nband int, OUT mean double precision)
        RETURNS double precision
-       AS $$ SELECT mean FROM _st_summarystats($1, $2, TRUE, 1) $$
+       AS $$ SELECT mean FROM st_summarystats($1, $2, TRUE, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
+*/
 
 CREATE OR REPLACE FUNCTION st_mean(rast raster, hasnodata boolean, OUT mean double precision)
        RETURNS double precision
-       AS $$ SELECT mean FROM _st_summarystats($1, 1, $2, 1) $$
+       AS $$ SELECT mean FROM st_summarystats($1, 1, $2, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_mean(rast raster, OUT mean double precision)
        RETURNS double precision
-       AS $$ SELECT mean FROM _st_summarystats($1, 1, TRUE, 1) $$
+       AS $$ SELECT mean FROM st_summarystats($1, 1, TRUE, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
+*/
 
-CREATE OR REPLACE FUNCTION st_approxmean(rast raster, nband int, hasnodata boolean, sample_percent double precision, OUT mean double precision)
+CREATE OR REPLACE FUNCTION st_approxmean(rast raster, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, sample_percent double precision DEFAULT 0.1, OUT mean double precision)
        RETURNS double precision
-       AS $$ SELECT mean FROM _st_summarystats($1, $2, $3, $4) $$
+       AS $$ SELECT mean FROM st_summarystats($1, $2, $3, $4) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxmean(rast raster, nband int, sample_percent double precision, OUT mean double precision)
        RETURNS double precision
-       AS $$ SELECT mean FROM _st_summarystats($1, $2, TRUE, $3) $$
+       AS $$ SELECT mean FROM st_summarystats($1, $2, TRUE, $3) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_approxmean(rast raster, hasnodata boolean, sample_percent double precision, OUT mean double precision)
+CREATE OR REPLACE FUNCTION st_approxmean(rast raster, hasnodata boolean, sample_percent double precision DEFAULT 0.1, OUT mean double precision)
        RETURNS double precision
-       AS $$ SELECT mean FROM _st_summarystats($1, 1, $2, $3) $$
+       AS $$ SELECT mean FROM st_summarystats($1, 1, $2, $3) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxmean(rast raster, sample_percent double precision, OUT mean double precision)
        RETURNS double precision
-       AS $$ SELECT mean FROM _st_summarystats($1, 1, TRUE, $2) $$
+       AS $$ SELECT mean FROM st_summarystats($1, 1, TRUE, $2) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_approxmean(rast raster, OUT mean double precision)
        RETURNS double precision
-       AS $$ SELECT mean FROM _st_summarystats($1, 1, TRUE, 0.1) $$
+       AS $$ SELECT mean FROM st_summarystats($1, 1, TRUE, 0.1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
+*/
 
-CREATE OR REPLACE FUNCTION st_mean(rastertable text, rastercolumn text, nband int, hasnodata boolean, OUT mean double precision)
+CREATE OR REPLACE FUNCTION st_mean(rastertable text, rastercolumn text, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, OUT mean double precision)
        RETURNS double precision
-       AS $$ SELECT mean FROM _st_summarystats($1, $2, $3, $4, 1) $$
+       AS $$ SELECT mean FROM st_summarystats($1, $2, $3, $4, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_mean(rastertable text, rastercolumn text, nband int, OUT mean double precision)
        RETURNS double precision
-       AS $$ SELECT mean FROM _st_summarystats($1, $2, $3, TRUE, 1) $$
+       AS $$ SELECT mean FROM st_summarystats($1, $2, $3, TRUE, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
+*/
 
 CREATE OR REPLACE FUNCTION st_mean(rastertable text, rastercolumn text, hasnodata boolean, OUT mean double precision)
        RETURNS double precision
-       AS $$ SELECT mean FROM _st_summarystats($1, $2, 1, $3, 1) $$
+       AS $$ SELECT mean FROM st_summarystats($1, $2, 1, $3, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_mean(rastertable text, rastercolumn text, OUT mean double precision)
        RETURNS double precision
-       AS $$ SELECT mean FROM _st_summarystats($1, $2, 1, TRUE, 1) $$
+       AS $$ SELECT mean FROM st_summarystats($1, $2, 1, TRUE, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
+*/
 
-CREATE OR REPLACE FUNCTION st_approxmean(rastertable text, rastercolumn text, nband int, hasnodata boolean, sample_percent double precision, OUT mean double precision)
+CREATE OR REPLACE FUNCTION st_approxmean(rastertable text, rastercolumn text, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, sample_percent double precision DEFAULT 0.1, OUT mean double precision)
        RETURNS double precision
-       AS $$ SELECT mean FROM _st_summarystats($1, $2, $3, $4, $5) $$
+       AS $$ SELECT mean FROM st_summarystats($1, $2, $3, $4, $5) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxmean(rastertable text, rastercolumn text, nband int, sample_percent double precision, OUT mean double precision)
        RETURNS double precision
-       AS $$ SELECT mean FROM _st_summarystats($1, $2, $3, TRUE, $4) $$
+       AS $$ SELECT mean FROM st_summarystats($1, $2, $3, TRUE, $4) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_approxmean(rastertable text, rastercolumn text, hasnodata boolean, sample_percent double precision, OUT mean double precision)
+CREATE OR REPLACE FUNCTION st_approxmean(rastertable text, rastercolumn text, hasnodata boolean, sample_percent double precision DEFAULT 0.1, OUT mean double precision)
        RETURNS double precision
-       AS $$ SELECT mean FROM _st_summarystats($1, $2, 1, $3, $4) $$
+       AS $$ SELECT mean FROM st_summarystats($1, $2, 1, $3, $4) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxmean(rastertable text, rastercolumn text, sample_percent double precision, OUT mean double precision)
        RETURNS double precision
-       AS $$ SELECT mean FROM _st_summarystats($1, $2, 1, TRUE, $3) $$
+       AS $$ SELECT mean FROM st_summarystats($1, $2, 1, TRUE, $3) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_approxmean(rastertable text, rastercolumn text, OUT mean double precision)
        RETURNS double precision
-       AS $$ SELECT mean FROM _st_summarystats($1, $2, 1, TRUE, 0.1) $$
+       AS $$ SELECT mean FROM st_summarystats($1, $2, 1, TRUE, 0.1) $$
        LANGUAGE 'SQL' STABLE STRICT;
+*/
 
 -----------------------------------------------------------------------
 -- ST_StdDev and ST_ApproxStdDev
 -----------------------------------------------------------------------
-CREATE OR REPLACE FUNCTION st_stddev(rast raster, nband int, hasnodata boolean, OUT stddev double precision)
+CREATE OR REPLACE FUNCTION st_stddev(rast raster, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, OUT stddev double precision)
        RETURNS double precision
-       AS $$ SELECT stddev FROM _st_summarystats($1, $2, $3, 1) $$
+       AS $$ SELECT stddev FROM st_summarystats($1, $2, $3, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_stddev(rast raster, nband int, OUT stddev double precision)
        RETURNS double precision
-       AS $$ SELECT stddev FROM _st_summarystats($1, $2, TRUE, 1) $$
+       AS $$ SELECT stddev FROM st_summarystats($1, $2, TRUE, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
+*/
 
 CREATE OR REPLACE FUNCTION st_stddev(rast raster, hasnodata boolean, OUT stddev double precision)
        RETURNS double precision
-       AS $$ SELECT stddev FROM _st_summarystats($1, 1, $2, 1) $$
+       AS $$ SELECT stddev FROM st_summarystats($1, 1, $2, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_stddev(rast raster, OUT stddev double precision)
        RETURNS double precision
-       AS $$ SELECT stddev FROM _st_summarystats($1, 1, TRUE, 1) $$
+       AS $$ SELECT stddev FROM st_summarystats($1, 1, TRUE, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
+*/
 
-CREATE OR REPLACE FUNCTION st_approxstddev(rast raster, nband int, hasnodata boolean, sample_percent double precision, OUT stddev double precision)
+CREATE OR REPLACE FUNCTION st_approxstddev(rast raster, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, sample_percent double precision DEFAULT 0.1, OUT stddev double precision)
        RETURNS double precision
-       AS $$ SELECT stddev FROM _st_summarystats($1, $2, $3, $4) $$
+       AS $$ SELECT stddev FROM st_summarystats($1, $2, $3, $4) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxstddev(rast raster, nband int, sample_percent double precision, OUT stddev double precision)
        RETURNS double precision
-       AS $$ SELECT stddev FROM _st_summarystats($1, $2, TRUE, $3) $$
+       AS $$ SELECT stddev FROM st_summarystats($1, $2, TRUE, $3) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_approxstddev(rast raster, hasnodata boolean, sample_percent double precision, OUT stddev double precision)
+CREATE OR REPLACE FUNCTION st_approxstddev(rast raster, hasnodata boolean, sample_percent double precision DEFAULT 0.1, OUT stddev double precision)
        RETURNS double precision
-       AS $$ SELECT stddev FROM _st_summarystats($1, 1, $2, $3) $$
+       AS $$ SELECT stddev FROM st_summarystats($1, 1, $2, $3) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxstddev(rast raster, sample_percent double precision, OUT stddev double precision)
        RETURNS double precision
-       AS $$ SELECT stddev FROM _st_summarystats($1, 1, TRUE, $2) $$
+       AS $$ SELECT stddev FROM st_summarystats($1, 1, TRUE, $2) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_approxstddev(rast raster, OUT stddev double precision)
        RETURNS double precision
-       AS $$ SELECT stddev FROM _st_summarystats($1, 1, TRUE, 0.1) $$
+       AS $$ SELECT stddev FROM st_summarystats($1, 1, TRUE, 0.1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
+*/
 
-CREATE OR REPLACE FUNCTION st_stddev(rastertable text, rastercolumn text, nband int, hasnodata boolean, OUT stddev double precision)
+CREATE OR REPLACE FUNCTION st_stddev(rastertable text, rastercolumn text, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, OUT stddev double precision)
        RETURNS double precision
-       AS $$ SELECT stddev FROM _st_summarystats($1, $2, $3, $4, 1) $$
+       AS $$ SELECT stddev FROM st_summarystats($1, $2, $3, $4, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_stddev(rastertable text, rastercolumn text, nband int, OUT stddev double precision)
        RETURNS double precision
-       AS $$ SELECT stddev FROM _st_summarystats($1, $2, $3, TRUE, 1) $$
+       AS $$ SELECT stddev FROM st_summarystats($1, $2, $3, TRUE, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
+*/
 
 CREATE OR REPLACE FUNCTION st_stddev(rastertable text, rastercolumn text, hasnodata boolean, OUT stddev double precision)
        RETURNS double precision
-       AS $$ SELECT stddev FROM _st_summarystats($1, $2, 1, $3, 1) $$
+       AS $$ SELECT stddev FROM st_summarystats($1, $2, 1, $3, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_stddev(rastertable text, rastercolumn text, OUT stddev double precision)
        RETURNS double precision
-       AS $$ SELECT stddev FROM _st_summarystats($1, $2, 1, TRUE, 1) $$
+       AS $$ SELECT stddev FROM st_summarystats($1, $2, 1, TRUE, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
+*/
 
-CREATE OR REPLACE FUNCTION st_approxstddev(rastertable text, rastercolumn text, nband int, hasnodata boolean, sample_percent double precision, OUT stddev double precision)
+CREATE OR REPLACE FUNCTION st_approxstddev(rastertable text, rastercolumn text, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, sample_percent double precision DEFAULT 0.1, OUT stddev double precision)
        RETURNS double precision
-       AS $$ SELECT stddev FROM _st_summarystats($1, $2, $3, $4, $5) $$
+       AS $$ SELECT stddev FROM st_summarystats($1, $2, $3, $4, $5) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxstddev(rastertable text, rastercolumn text, nband int, sample_percent double precision, OUT stddev double precision)
        RETURNS double precision
-       AS $$ SELECT stddev FROM _st_summarystats($1, $2, $3, TRUE, $4) $$
+       AS $$ SELECT stddev FROM st_summarystats($1, $2, $3, TRUE, $4) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_approxstddev(rastertable text, rastercolumn text, hasnodata boolean, sample_percent double precision, OUT stddev double precision)
+CREATE OR REPLACE FUNCTION st_approxstddev(rastertable text, rastercolumn text, hasnodata boolean, sample_percent double precision DEFAULT 0.1, OUT stddev double precision)
        RETURNS double precision
-       AS $$ SELECT stddev FROM _st_summarystats($1, $2, 1, $3, $4) $$
+       AS $$ SELECT stddev FROM st_summarystats($1, $2, 1, $3, $4) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxstddev(rastertable text, rastercolumn text, sample_percent double precision, OUT stddev double precision)
        RETURNS double precision
-       AS $$ SELECT stddev FROM _st_summarystats($1, $2, 1, TRUE, $3) $$
+       AS $$ SELECT stddev FROM st_summarystats($1, $2, 1, TRUE, $3) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_approxstddev(rastertable text, rastercolumn text, OUT stddev double precision)
        RETURNS double precision
-       AS $$ SELECT stddev FROM _st_summarystats($1, $2, 1, TRUE, 0.1) $$
+       AS $$ SELECT stddev FROM st_summarystats($1, $2, 1, TRUE, 0.1) $$
        LANGUAGE 'SQL' STABLE STRICT;
+*/
 
 -----------------------------------------------------------------------
 -- ST_MinMax and ST_ApproxMinMax
 -----------------------------------------------------------------------
-CREATE OR REPLACE FUNCTION st_minmax(rast raster, nband int, hasnodata boolean, OUT min double precision, OUT max double precision)
+CREATE OR REPLACE FUNCTION st_minmax(rast raster, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, OUT min double precision, OUT max double precision)
        RETURNS record
-       AS $$ SELECT min, max FROM _st_summarystats($1, $2, $3, 1) $$
+       AS $$ SELECT min, max FROM st_summarystats($1, $2, $3, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_minmax(rast raster, nband int, OUT min double precision, OUT max double precision)
        RETURNS record
-       AS $$ SELECT min, max FROM _st_summarystats($1, $2, TRUE, 1) $$
+       AS $$ SELECT min, max FROM st_summarystats($1, $2, TRUE, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
+*/
 
 CREATE OR REPLACE FUNCTION st_minmax(rast raster, hasnodata boolean, OUT min double precision, OUT max double precision)
        RETURNS record
-       AS $$ SELECT min, max FROM _st_summarystats($1, 1, $2, 1) $$
+       AS $$ SELECT min, max FROM st_summarystats($1, 1, $2, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_minmax(rast raster, OUT min double precision, OUT max double precision)
        RETURNS record
-       AS $$ SELECT min, max FROM _st_summarystats($1, 1, TRUE, 1) $$
+       AS $$ SELECT min, max FROM st_summarystats($1, 1, TRUE, 1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
+*/
 
-CREATE OR REPLACE FUNCTION st_approxminmax(rast raster, nband int, hasnodata boolean, sample_percent double precision, OUT min double precision, OUT max double precision)
+CREATE OR REPLACE FUNCTION st_approxminmax(rast raster, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, sample_percent double precision DEFAULT 0.1, OUT min double precision, OUT max double precision)
        RETURNS record
-       AS $$ SELECT min, max FROM _st_summarystats($1, $2, $3, $4) $$
+       AS $$ SELECT min, max FROM st_summarystats($1, $2, $3, $4) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxminmax(rast raster, nband int, sample_percent double precision, OUT min double precision, OUT max double precision)
        RETURNS record
-       AS $$ SELECT min, max FROM _st_summarystats($1, $2, TRUE, $3) $$
+       AS $$ SELECT min, max FROM st_summarystats($1, $2, TRUE, $3) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_approxminmax(rast raster, hasnodata boolean, sample_percent double precision, OUT min double precision, OUT max double precision)
+CREATE OR REPLACE FUNCTION st_approxminmax(rast raster, hasnodata boolean, sample_percent double precision DEFAULT 0.1, OUT min double precision, OUT max double precision)
        RETURNS record
-       AS $$ SELECT min, max FROM _st_summarystats($1, 1, $2, $3) $$
+       AS $$ SELECT min, max FROM st_summarystats($1, 1, $2, $3) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxminmax(rast raster, sample_percent double precision, OUT min double precision, OUT max double precision)
        RETURNS record
-       AS $$ SELECT min, max FROM _st_summarystats($1, 1, TRUE, $2) $$
+       AS $$ SELECT min, max FROM st_summarystats($1, 1, TRUE, $2) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_approxminmax(rast raster, OUT min double precision, OUT max double precision)
        RETURNS record
-       AS $$ SELECT min, max FROM _st_summarystats($1, 1, TRUE, 0.1) $$
+       AS $$ SELECT min, max FROM st_summarystats($1, 1, TRUE, 0.1) $$
        LANGUAGE 'SQL' IMMUTABLE STRICT;
+*/
 
-CREATE OR REPLACE FUNCTION st_minmax(rastertable text, rastercolumn text, nband int, hasnodata boolean, OUT min double precision, OUT max double precision)
+CREATE OR REPLACE FUNCTION st_minmax(rastertable text, rastercolumn text, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, OUT min double precision, OUT max double precision)
        RETURNS record
-       AS $$ SELECT min, max FROM _st_summarystats($1, $2, $3, $4, 1) $$
+       AS $$ SELECT min, max FROM st_summarystats($1, $2, $3, $4, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_minmax(rastertable text, rastercolumn text, nband int, OUT min double precision, OUT max double precision)
        RETURNS record
-       AS $$ SELECT min, max FROM _st_summarystats($1, $2, $3, TRUE, 1) $$
+       AS $$ SELECT min, max FROM st_summarystats($1, $2, $3, TRUE, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
+*/
 
 CREATE OR REPLACE FUNCTION st_minmax(rastertable text, rastercolumn text, hasnodata boolean, OUT min double precision, OUT max double precision)
        RETURNS record
-       AS $$ SELECT min, max FROM _st_summarystats($1, $2, 1, $3, 1) $$
+       AS $$ SELECT min, max FROM st_summarystats($1, $2, 1, $3, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_minmax(rastertable text, rastercolumn text, OUT min double precision, OUT max double precision)
        RETURNS record
-       AS $$ SELECT min, max FROM _st_summarystats($1, $2, 1, TRUE, 1) $$
+       AS $$ SELECT min, max FROM st_summarystats($1, $2, 1, TRUE, 1) $$
        LANGUAGE 'SQL' STABLE STRICT;
+*/
 
-CREATE OR REPLACE FUNCTION st_approxminmax(rastertable text, rastercolumn text, nband int, hasnodata boolean, sample_percent double precision, OUT min double precision, OUT max double precision)
+CREATE OR REPLACE FUNCTION st_approxminmax(rastertable text, rastercolumn text, nband int DEFAULT 1, hasnodata boolean DEFAULT TRUE, sample_percent double precision DEFAULT 0.1, OUT min double precision, OUT max double precision)
        RETURNS record
-       AS $$ SELECT min, max FROM _st_summarystats($1, $2, $3, $4, $5) $$
+       AS $$ SELECT min, max FROM st_summarystats($1, $2, $3, $4, $5) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxminmax(rastertable text, rastercolumn text, nband int, sample_percent double precision, OUT min double precision, OUT max double precision)
        RETURNS record
-       AS $$ SELECT min, max FROM _st_summarystats($1, $2, $3, TRUE, $4) $$
+       AS $$ SELECT min, max FROM st_summarystats($1, $2, $3, TRUE, $4) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_approxminmax(rastertable text, rastercolumn text, hasnodata boolean, sample_percent double precision, OUT min double precision, OUT max double precision)
+CREATE OR REPLACE FUNCTION st_approxminmax(rastertable text, rastercolumn text, hasnodata boolean, sample_percent double precision DEFAULT 0.1, OUT min double precision, OUT max double precision)
        RETURNS record
-       AS $$ SELECT min, max FROM _st_summarystats($1, $2, 1, $3, $4) $$
+       AS $$ SELECT min, max FROM st_summarystats($1, $2, 1, $3, $4) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
 CREATE OR REPLACE FUNCTION st_approxminmax(rastertable text, rastercolumn text, sample_percent double precision, OUT min double precision, OUT max double precision)
        RETURNS record
-       AS $$ SELECT min, max FROM _st_summarystats($1, $2, 1, TRUE, $3) $$
+       AS $$ SELECT min, max FROM st_summarystats($1, $2, 1, TRUE, $3) $$
        LANGUAGE 'SQL' STABLE STRICT;
 
+/*
 CREATE OR REPLACE FUNCTION st_approxminmax(rastertable text, rastercolumn text, OUT min double precision, OUT max double precision)
        RETURNS record
-       AS $$ SELECT min, max FROM _st_summarystats($1, $2, 1, TRUE, 0.1) $$
+       AS $$ SELECT min, max FROM st_summarystats($1, $2, 1, TRUE, 0.1) $$
        LANGUAGE 'SQL' STABLE STRICT;
+*/
 
 -----------------------------------------------------------------------
 -- ST_Histogram and ST_ApproxHistogram