From: Bborie Park <bkpark at ucdavis.edu>
Date: Mon, 6 Aug 2012 22:29:13 +0000 (+0000)
Subject: Refactor data type cleanup
X-Git-Tag: 2.1.0beta2~706
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bbcb0aa9c3ba4d28bb642fd2917d5eedd7894666;p=postgis

Refactor data type cleanup

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

diff --git a/raster/rt_pg/rtpostgis_upgrade_cleanup.sql.in.c b/raster/rt_pg/rtpostgis_upgrade_cleanup.sql.in.c
index 89353ae5b..8735760e7 100644
--- a/raster/rt_pg/rtpostgis_upgrade_cleanup.sql.in.c
+++ b/raster/rt_pg/rtpostgis_upgrade_cleanup.sql.in.c
@@ -104,10 +104,13 @@ DROP CAST IF EXISTS (raster AS geometry);
 CREATE CAST (raster AS geometry)
 	WITH FUNCTION st_convexhull(raster) AS ASSIGNMENT;
 
+-- cleanup poorly thought up experiments
+DROP TYPE IF EXISTS old_addbandarg CASCADE;
+DROP TYPE IF EXISTS old_agg_samealignment CASCADE;
+
 -- new TYPE
-ALTER TYPE addbandarg RENAME TO old_addbandarg;
-DROP FUNCTION IF EXISTS st_addband(raster, old_addbandarg[]);
-DROP TYPE IF EXISTS old_addbandarg;
+DROP FUNCTION IF EXISTS st_addband(raster, addbandarg[]);
+DROP TYPE IF EXISTS addbandarg;
 CREATE TYPE addbandarg AS (
 	index int,
 	pixeltype text,
@@ -116,11 +119,10 @@ CREATE TYPE addbandarg AS (
 );
 
 -- new TYPE
-ALTER TYPE agg_samealignment RENAME TO old_agg_samealignment;
 DROP AGGREGATE IF EXISTS st_samealignment(raster);
-DROP FUNCTION IF EXISTS _st_samealignment_transfn(old_agg_samealignment, raster);
-DROP FUNCTION IF EXISTS _st_samealignment_finalfn(old_agg_samealignment);
-DROP TYPE IF EXISTS old_agg_samealignment;
+DROP FUNCTION IF EXISTS _st_samealignment_transfn(agg_samealignment, raster);
+DROP FUNCTION IF EXISTS _st_samealignment_finalfn(agg_samealignment);
+DROP TYPE IF EXISTS agg_samealignment;
 CREATE TYPE agg_samealignment AS (
 	refraster raster,
 	aligned boolean