From 27965e6182266c61d70dba1e4e00f8150d5d6a7c Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Sun, 23 Feb 2014 16:29:45 +0000 Subject: [PATCH] Fix AGG signatures with multi-word typenames For example... "double precision". This fixes upgrades involving drop/recreate of aggregates git-svn-id: http://svn.osgeo.org/postgis/trunk@12262 b70326c6-7e19-0410-871a-916f4a2858ee --- utils/postgis_proc_upgrade.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/utils/postgis_proc_upgrade.pl b/utils/postgis_proc_upgrade.pl index 0b7836fe3..fe1da1088 100755 --- a/utils/postgis_proc_upgrade.pl +++ b/utils/postgis_proc_upgrade.pl @@ -97,10 +97,10 @@ my $objs = { }, "202" => { "aggregates" => { - "st_summarystatsagg(raster,integer,boolean,doubleprecision)" => 1, - "st_summarystatsagg(raster,boolean,doubleprecision)" => 1, + "st_summarystatsagg(raster,integer,boolean,double precision)" => 1, + "st_summarystatsagg(raster,boolean,double precision)" => 1, "st_summarystatsagg(raster,integer)" => 1, - "st_countagg(raster,integer,boolean,doubleprecision)" => 1, + "st_countagg(raster,integer,boolean,double precision)" => 1, "st_countagg(raster,integer,boolean)" => 1, "st_countagg(raster,boolean)" => 1 } @@ -280,7 +280,8 @@ while() my $def = $_; if ( /^create aggregate\s+\S+\s*\(([^)]*)\)/i ) { $aggtype = $1; - $aggtype =~ s/\s*//g; + $aggtype =~ s/\s*,\s*/,/g; # drop spaces around commas + $aggtype =~ s/\s\s*/ /g; # collapse multiple spaces into one } while() {