From: Regina Obe <lr@pcorp.us>
Date: Mon, 21 Nov 2011 04:02:24 +0000 (+0000)
Subject: FIX upgrade script - complement to r8186 - drop all mapalgebra functions before upgra... 
X-Git-Tag: 2.0.0alpha1~664
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=37eff362f3772249d79323600804fa912aff61e3;p=postgis

FIX upgrade script - complement to r8186 - drop all mapalgebra functions before upgrade because for pg9.0+ CREATE OR REPLACE FUNCTION fails if argument names have changed.  Also update docs to reflect new naming of userfunction to onerasteruderfunc,tworasteruserfunc,onerasternguserfunc

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

diff --git a/doc/reference_raster.xml b/doc/reference_raster.xml
index d1723ed0a..fec76fa26 100644
--- a/doc/reference_raster.xml
+++ b/doc/reference_raster.xml
@@ -6153,7 +6153,7 @@ SELECT ST_MapAlgebraFct(m1.rast, 1, m1.rast,3 ,
 				<paramdef><type>text </type> <parameter>pixeltype</parameter></paramdef>
 				<paramdef><type>integer </type> <parameter>ngbwidth</parameter></paramdef>
 				<paramdef><type>integer </type> <parameter>ngbheight</parameter></paramdef>
-				<paramdef><type>regprocedure </type> <parameter>userfunction</parameter></paramdef>
+				<paramdef><type>regprocedure </type> <parameter>onerastngbuserfunc</parameter></paramdef>
 				<paramdef><type>text </type> <parameter>nodatamode</parameter></paramdef>
 				<paramdef><type>text[] </type> <parameter>VARIADIC args</parameter></paramdef>
 			  </funcprototype>
@@ -6192,8 +6192,8 @@ SELECT ST_MapAlgebraFct(m1.rast, 1, m1.rast,3 ,
 						<listitem><para>The height of the neighborhood, in cells.</para></listitem>
 					</varlistentry>
 					<varlistentry>
-						<term>userfunction</term>
-						<listitem><para>PLPGSQL/psql user function to apply to neighborhood pixels. The first element is a 2-dimensional
+						<term>onerastngbuserfuncn</term>
+						<listitem><para>PLPGSQL/psql user function to apply to neighborhood pixels of a single band of a raster. The first element is a 2-dimensional
 							array of numbers representing the rectangular pixel neighborhood</para></listitem>
 					</varlistentry>
 					<varlistentry>
@@ -6279,7 +6279,7 @@ SELECT ST_MapAlgebraFctNgb(rast, 1,  '8BUI', 2, 2, 'rast_avg(float[][], text, te
 		  <refsection>
 			<title>See Also</title>
 		
-			<para><xref linkend="RT_ST_MapAlgebraFct" />, <xref linkend="RT_ST_Rescale" /></para>
+			<para><xref linkend="RT_ST_MapAlgebraFct" />, <xref linkend="RT_ST_MapAlgebraExpr" />, <xref linkend="RT_ST_Rescale" /></para>
 		  </refsection>
 		</refentry>
 		
diff --git a/raster/rt_pg/rtpostgis_drop.sql.in.c b/raster/rt_pg/rtpostgis_drop.sql.in.c
index fd3dca312..7a06831ad 100644
--- a/raster/rt_pg/rtpostgis_drop.sql.in.c
+++ b/raster/rt_pg/rtpostgis_drop.sql.in.c
@@ -53,13 +53,27 @@ DROP FUNCTION IF EXISTS ST_Intersection(geometry,raster);
 DROP FUNCTION IF EXISTS ST_Intersection(raster, geometry);
 DROP FUNCTION IF EXISTS ST_Intersection(raster, integer, geometry);
 
---these were renamed to ST_MapAlgebraExpr --
+--these were renamed to ST_MapAlgebraExpr or argument names changed --
 DROP FUNCTION IF EXISTS ST_MapAlgebra(raster, integer, text, text, nodatavaluerepl text);
 DROP FUNCTION IF EXISTS ST_MapAlgebra(raster, pixeltype text, expression text, nodatavaluerepl text);
 
---signatures changed
-DROP FUNCTION IF EXISTS  ST_MapAlgebraExpr(raster, integer, text, text, text);
-DROP FUNCTION IF EXISTS  ST_MapAlgebraExpr(raster, text, text, text);
+
+--signatures or arg names changed
+DROP FUNCTION IF EXISTS ST_MapAlgebraExpr(raster, integer, text, text, text);
+DROP FUNCTION IF EXISTS ST_MapAlgebraExpr(raster, text, text, text);
+DROP FUNCTION IF EXISTS ST_MapalgebraFct(raster, regprocedure);
+DROP FUNCTION IF EXISTS ST_MapAlgebraFct(raster, text, regprocedure, VARIADIC text[]); 
+DROP FUNCTION IF EXISTS ST_MapAlgebraFct(raster, text, regprocedure); 
+DROP FUNCTION IF EXISTS ST_MapAlgebraFct(raster, regprocedure, VARIADIC text[]);
+DROP FUNCTION IF EXISTS ST_MapAlgebraFct(raster, integer, regprocedure, variadic text[]);
+DROP FUNCTION IF EXISTS ST_MapAlgebraFct(raster, integer, text, regprocedure, VARIADIC text[]); 
+DROP FUNCTION IF EXISTS ST_MapAlgebraFct(raster, integer, text, regprocedure); 
+DROP FUNCTION IF EXISTS ST_MapAlgebraFct(raster, integer, regprocedure, variadic text[]);
+DROP FUNCTION IF EXISTS ST_MapalgebraFct(raster, integer, regprocedure);
+DROP FUNCTION IF EXISTS ST_MapAlgebraFct(raster, raster, regprocedure, text, text, VARIADIC text[]);
+DROP FUNCTION IF EXISTS ST_MapAlgebraFct(raster, integer, raster, integer, regprocedure, text, text, VARIADIC text[]);
+DROP FUNCTION IF EXISTS ST_MapAlgebraFctNgb(raster, integer, text, integer, integer, regprocedure, text,  VARIADIC text[]);
+
 
 --dropped functions
 DROP FUNCTION IF EXISTS  ST_MapAlgebraFct(raster, raster, regprocedure, VARIADIC text[]);