Start work on #949 uninstall_legacy.sql and also some minor cleanup additions/sorting...

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

diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index d87fdf071721223581fbbae44d62bf8202243965..8f930527590a7c3941d7d40278c498b9d9ea1923 100644 (file)
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -14,11 +14,11 @@ MODULE_big=postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
 MODULEDIR=contrib/$(MODULE_big)
 
 # Files to be copied to the contrib/ directory
-DATA_built=postgis.sql uninstall_postgis.sql postgis_upgrade_20_minor.sql legacy.sql
+DATA_built=postgis.sql uninstall_postgis.sql postgis_upgrade_20_minor.sql legacy.sql uninstall_legacy.sql
 DATA=../spatial_ref_sys.sql
 
 # SQL objects (files requiring C pre-processing)
-SQL_OBJS=postgis.sql.in uninstall_postgis.sql.in legacy.sql.in
+SQL_OBJS=postgis.sql.in uninstall_postgis.sql.in legacy.sql.in uninstall_legacy.sql.in
 
 # PostgreSQL objects
 PG_OBJS=lwgeom_pg.o \

diff --git a/postgis/legacy.sql.in.c b/postgis/legacy.sql.in.c
index e774d9399d97c229eb699d168c8649b6032f6433..ccc1e26b279296596a221ad88439bde4ae05a580 100644 (file)
--- a/postgis/legacy.sql.in.c
+++ b/postgis/legacy.sql.in.c
@@ -323,68 +323,69 @@ CREATE OR REPLACE FUNCTION Affine(geometry,float8,float8,float8,float8,float8,fl
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION Affine(geometry,float8,float8,float8,float8,float8,float8)
        RETURNS geometry
-       AS 'SELECT affine($1,  $2, $3, 0,  $4, $5, 0,  0, 0, 1,  $6, $7, 0)'
+       AS 'SELECT st_affine($1,  $2, $3, 0,  $4, $5, 0,  0, 0, 1,  $6, $7, 0)'
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
 -- Availability: 1.1.2
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION RotateZ(geometry,float8)
        RETURNS geometry
-       AS 'SELECT affine($1,  cos($2), -sin($2), 0,  sin($2), cos($2), 0,  0, 0, 1,  0, 0, 0)'
+       AS 'SELECT st_affine($1,  cos($2), -sin($2), 0,  sin($2), cos($2), 0,  0, 0, 1,  0, 0, 0)'
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
 -- Availability: 1.1.2
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION Rotate(geometry,float8)
        RETURNS geometry
-       AS 'SELECT rotateZ($1, $2)'
+       AS 'SELECT st_rotateZ($1, $2)'
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
 -- Availability: 1.1.2
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION RotateX(geometry,float8)
        RETURNS geometry
-       AS 'SELECT affine($1, 1, 0, 0, 0, cos($2), -sin($2), 0, sin($2), cos($2), 0, 0, 0)'
+       AS 'SELECT st_affine($1, 1, 0, 0, 0, cos($2), -sin($2), 0, sin($2), cos($2), 0, 0, 0)'
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
 -- Availability: 1.1.2
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION RotateY(geometry,float8)
        RETURNS geometry
-       AS 'SELECT affine($1,  cos($2), 0, sin($2),  0, 1, 0,  -sin($2), 0, cos($2), 0,  0, 0)'
+       AS 'SELECT st_affine($1,  cos($2), 0, sin($2),  0, 1, 0,  -sin($2), 0, cos($2), 0,  0, 0)'
        LANGUAGE 'SQL' IMMUTABLE STRICT;
-
+       
+-- Availability: 1.1.0
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION Translate(geometry,float8,float8,float8)
+CREATE OR REPLACE FUNCTION Scale(geometry,float8,float8,float8)
        RETURNS geometry
-       AS 'SELECT affine($1, 1, 0, 0, 0, 1, 0, 0, 0, 1, $2, $3, $4)'
+       AS 'SELECT st_affine($1,  $2, 0, 0,  0, $3, 0,  0, 0, $4,  0, 0, 0)'
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
+-- Availability: 1.1.0
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION Translate(geometry,float8,float8)
+CREATE OR REPLACE FUNCTION Scale(geometry,float8,float8)
        RETURNS geometry
-       AS 'SELECT translate($1, $2, $3, 0)'
+       AS 'SELECT st_scale($1, $2, $3, 1)'
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
--- Availability: 1.1.0
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION Scale(geometry,float8,float8,float8)
+CREATE OR REPLACE FUNCTION Translate(geometry,float8,float8,float8)
        RETURNS geometry
-       AS 'SELECT affine($1,  $2, 0, 0,  0, $3, 0,  0, 0, $4,  0, 0, 0)'
+       AS 'SELECT st_affine($1, 1, 0, 0, 0, 1, 0, 0, 0, 1, $2, $3, $4)'
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
--- Availability: 1.1.0
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION Scale(geometry,float8,float8)
+CREATE OR REPLACE FUNCTION Translate(geometry,float8,float8)
        RETURNS geometry
-       AS 'SELECT scale($1, $2, $3, 1)'
+       AS 'SELECT st_translate($1, $2, $3, 0)'
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
+
 -- Availability: 1.1.0
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION transscale(geometry,float8,float8,float8,float8)
+CREATE OR REPLACE FUNCTION TransScale(geometry,float8,float8,float8,float8)
        RETURNS geometry
-       AS 'SELECT affine($1,  $4, 0, 0,  0, $5, 0,
+       AS 'SELECT st_affine($1,  $4, 0, 0,  0, $5, 0,
                0, 0, 1,  $2 * $4, $3 * $5, 0)'
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
@@ -403,7 +404,7 @@ CREATE OR REPLACE FUNCTION AddPoint(geometry, geometry, integer)
        LANGUAGE 'C' IMMUTABLE STRICT;
        
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION area(geometry)
+CREATE OR REPLACE FUNCTION Area(geometry)
        RETURNS FLOAT8
        AS 'MODULE_PATHNAME','LWGEOM_area_polygon'
        LANGUAGE 'C' IMMUTABLE STRICT;
@@ -411,7 +412,7 @@ CREATE OR REPLACE FUNCTION area(geometry)
 -- this is an alias for 'area(geometry)'
 -- there is nothing such an 'area3d'...
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION area2d(geometry)
+CREATE OR REPLACE FUNCTION Area2D(geometry)
        RETURNS FLOAT8
        AS 'MODULE_PATHNAME', 'LWGEOM_area_polygon'
        LANGUAGE 'C' IMMUTABLE STRICT;

diff --git a/postgis/postgis_drop.sql.in.c b/postgis/postgis_drop.sql.in.c
index 273f366e4ddc14ac3580ca08e32b055c462e0a8a..82862667ce54c2c918d8219d504a8dee6f529cbe 100644 (file)
--- a/postgis/postgis_drop.sql.in.c
+++ b/postgis/postgis_drop.sql.in.c
@@ -57,3 +57,16 @@ DROP FUNCTION IF EXISTS geosnoop(geometry);
 DROP FUNCTION IF EXISTS jtsnoop(geometry);
 DROP FUNCTION IF EXISTS st_noop(geometry);
 DROP FUNCTION IF EXISTS st_max_distance(geometry, geometry);
+-- Drop internals that should never have existed --
+DROP FUNCTION IF EXISTS st_geometry_analyze(internal);
+DROP FUNCTION IF EXISTS st_geometry_in(cstring);
+DROP FUNCTION IF EXISTS st_geometry_out(geometry);
+DROP FUNCTION IF EXISTS st_geometry_recv(internal);
+DROP FUNCTION IF EXISTS st_geometry_send(geometry);
+DROP FUNCTION IF EXISTS st_spheroid_in(cstring);
+DROP FUNCTION IF EXISTS st_spheroid_out(spheroid);
+DROP FUNCTION IF EXISTS st_geometry_lt(geometry, geometry);
+DROP FUNCTION IF EXISTS st_geometry_gt(geometry, geometry);
+DROP FUNCTION IF EXISTS st_geometry_ge(geometry, geometry);
+DROP FUNCTION IF EXISTS st_geometry_eq(geometry, geometry);
+DROP FUNCTION IF EXISTS st_geometry_cmp(geometry, geometry);
\ No newline at end of file

diff --git a/postgis/uninstall_legacy.sql.in.c b/postgis/uninstall_legacy.sql.in.c
new file mode 100644 (file)
index 0000000..531ee37
--- /dev/null
+++ b/postgis/uninstall_legacy.sql.in.c
@@ -0,0 +1,23 @@
+-- $Id: uninstall_legacy.sql.in.c 7065 2011-04-26 12:35:02Z robe $
+-- Uninstall Legacy functions useful when you have your applications finally set up to not use legacy functions  --
+#include "sqldefines.h"
+--- start functions that in theory should never have been used or internal like stuff deprecated
+#include "postgis_drop.sql.in.c"
+-- Drop Affine family of deprecated functions --
+DROP FUNCTION IF EXISTS Affine(geometry,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8,float8);
+DROP FUNCTION IF EXISTS Affine(geometry,float8,float8,float8,float8,float8,float8);
+DROP FUNCTION IF EXISTS RotateZ(geometry,float8);
+DROP FUNCTION IF EXISTS Rotate(geometry,float8);
+DROP FUNCTION IF EXISTS RotateX(geometry,float8);
+DROP FUNCTION IF EXISTS RotateY(geometry,float8);
+DROP FUNCTION IF EXISTS Scale(geometry,float8,float8,float8);
+DROP FUNCTION IF EXISTS Scale(geometry,float8,float8);
+DROP FUNCTION IF EXISTS Translate(geometry,float8,float8,float8);
+DROP FUNCTION IF EXISTS Translate(geometry,float8,float8);
+DROP FUNCTION IF EXISTS TransScale(geometry,float8,float8,float8,float8);
+
+-- Other functions --
+DROP FUNCTION IF EXISTS AddPoint(geometry,geometry);
+DROP FUNCTION IF EXISTS AddPoint(geometry,geometry, integer);
+DROP FUNCTION IF EXISTS Area(geometry);
+DROP FUNCTION IF EXISTS Area2D(geometry);