Create new legacy compatibility layer script which will install the absolute minimal...

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

diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index 3bc68f257f4ad4cbebd5b94132e4b1bdb00e0eb8..542cddff08a1f24c82400656041d6782e1bc933d 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 uninstall_legacy.sql
+DATA_built=postgis.sql uninstall_postgis.sql postgis_upgrade_20_minor.sql legacy.sql uninstall_legacy.sql legacy_compatibility_layer.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 uninstall_legacy.sql.in
+SQL_OBJS=postgis.sql.in uninstall_postgis.sql.in legacy.sql.in uninstall_legacy.sql.in legacy_compatibility_layer.sql.in
 
 # PostgreSQL objects
 PG_OBJS=lwgeom_pg.o \

diff --git a/postgis/legacy.sql.in.c b/postgis/legacy.sql.in.c
index 376b277ca494e2f1d3fd9280455d72dca1ab9574..34b227143d948f29bc144a56c0e3d69b7bc7fb67 100644 (file)
--- a/postgis/legacy.sql.in.c
+++ b/postgis/legacy.sql.in.c
@@ -1,6 +1,6 @@
 -- $Id$
 -- Legacy functions without chip functions --
-#include "sqldefines.h"
+#include "legacy_compatibility_layer.sql.in.c"
 --- start functions that in theory should never have been used or internal like stuff deprecated
 
 -- these were superceded by PostGIS_AddBBOX , PostGIS_DropBBOX, PostGIS_HasBBOX in 1.5 --
@@ -614,18 +614,6 @@ CREATE OR REPLACE FUNCTION Area2D(geometry)
        AS 'MODULE_PATHNAME', 'LWGEOM_area_polygon'
        LANGUAGE 'C' IMMUTABLE STRICT;
        
--- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION AsBinary(geometry)
-       RETURNS bytea
-       AS 'MODULE_PATHNAME','LWGEOM_asBinary'
-       LANGUAGE 'C' IMMUTABLE STRICT;
-       
--- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION AsBinary(geometry,text)
-       RETURNS bytea
-       AS 'MODULE_PATHNAME','LWGEOM_asBinary'
-       LANGUAGE 'C' IMMUTABLE STRICT;
-
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION AsEWKB(geometry)
        RETURNS BYTEA
@@ -709,12 +697,6 @@ CREATE OR REPLACE FUNCTION AsSVG(geometry,int4,int4)
        AS 'MODULE_PATHNAME','LWGEOM_asSVG'
        LANGUAGE 'C' IMMUTABLE STRICT;
 
--- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION AsText(geometry)
-       RETURNS TEXT
-       AS 'MODULE_PATHNAME','LWGEOM_asText'
-       LANGUAGE 'C' IMMUTABLE STRICT;  
-
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION azimuth(geometry,geometry)
        RETURNS float8
@@ -881,25 +863,7 @@ CREATE OR REPLACE FUNCTION Envelope(geometry)
        RETURNS geometry
        AS 'MODULE_PATHNAME', 'LWGEOM_envelope'
        LANGUAGE 'C' IMMUTABLE STRICT;
-       
--- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION Estimated_Extent(text,text,text) RETURNS box2d AS
-#ifdef GSERIALIZED_ON
-       'MODULE_PATHNAME', 'geometry_estimated_extent'
-#else
-       'MODULE_PATHNAME', 'LWGEOM_estimated_extent'
-#endif
-       LANGUAGE 'C' IMMUTABLE STRICT SECURITY DEFINER;
-       
--- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION Estimated_Extent(text,text) RETURNS box2d AS
-#ifdef GSERIALIZED_ON
-       'MODULE_PATHNAME', 'geometry_estimated_extent'
-#else
-       'MODULE_PATHNAME', 'LWGEOM_estimated_extent'
-#endif
-       LANGUAGE 'C' IMMUTABLE STRICT SECURITY DEFINER;
-       
+               
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION Expand(box2d,float8)
        RETURNS box2d
@@ -1610,12 +1574,6 @@ CREATE OR REPLACE FUNCTION MultiPolygonFromText(text)
        AS 'SELECT MPolyFromText($1)'
        LANGUAGE 'SQL' IMMUTABLE STRICT;
 
--- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION ndims(geometry)
-       RETURNS smallint
-       AS 'MODULE_PATHNAME', 'LWGEOM_ndims'
-       LANGUAGE 'C' IMMUTABLE STRICT;
-
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION NumInteriorRing(geometry)
        RETURNS integer

diff --git a/postgis/legacy_compatibility_layer.sql.in.c b/postgis/legacy_compatibility_layer.sql.in.c
new file mode 100644 (file)
index 0000000..acfa5be
--- /dev/null
+++ b/postgis/legacy_compatibility_layer.sql.in.c
@@ -0,0 +1,51 @@
+-- $Id: legacy.sql.in.c 7548 2011-07-02 08:58:38Z robe $
+-- Legacy functions without chip functions --
+#include "sqldefines.h"
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION AsBinary(geometry)
+       RETURNS bytea
+       AS 'MODULE_PATHNAME','LWGEOM_asBinary'
+       LANGUAGE 'C' IMMUTABLE STRICT;
+       
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION AsBinary(geometry,text)
+       RETURNS bytea
+       AS 'MODULE_PATHNAME','LWGEOM_asBinary'
+       LANGUAGE 'C' IMMUTABLE STRICT;
+
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION AsText(geometry)
+       RETURNS TEXT
+       AS 'MODULE_PATHNAME','LWGEOM_asText'
+       LANGUAGE 'C' IMMUTABLE STRICT;  
+
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION Estimated_Extent(text,text,text) RETURNS box2d AS
+#ifdef GSERIALIZED_ON
+       'MODULE_PATHNAME', 'geometry_estimated_extent'
+#else
+       'MODULE_PATHNAME', 'LWGEOM_estimated_extent'
+#endif
+       LANGUAGE 'C' IMMUTABLE STRICT SECURITY DEFINER;
+       
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION Estimated_Extent(text,text) RETURNS box2d AS
+#ifdef GSERIALIZED_ON
+       'MODULE_PATHNAME', 'geometry_estimated_extent'
+#else
+       'MODULE_PATHNAME', 'LWGEOM_estimated_extent'
+#endif
+       LANGUAGE 'C' IMMUTABLE STRICT SECURITY DEFINER;
+       
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION ndims(geometry)
+       RETURNS smallint
+       AS 'MODULE_PATHNAME', 'LWGEOM_ndims'
+       LANGUAGE 'C' IMMUTABLE STRICT;
+       
+-- Deprecation in 1.2.3
+CREATE OR REPLACE FUNCTION SRID(geometry)
+       RETURNS int4
+       AS 'MODULE_PATHNAME','LWGEOM_get_srid'
+       LANGUAGE 'C' IMMUTABLE STRICT;
+       

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index c1d5510f6a8fa5236bfd3e10d7b23b0c56d88187..2be2feb7939920728e8cd44909962e8ded74980a 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -3717,13 +3717,6 @@ CREATE OR REPLACE FUNCTION ST_IsEmpty(geometry)
        AS 'MODULE_PATHNAME', 'LWGEOM_isempty'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
 \r
--- Deprecation in 1.2.3\r
-CREATE OR REPLACE FUNCTION SRID(geometry)\r
-       RETURNS int4\r
-       AS 'MODULE_PATHNAME','LWGEOM_get_srid'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
--- PostGIS equivalent function: getSRID(geometry)\r
 CREATE OR REPLACE FUNCTION ST_SRID(geometry)\r
        RETURNS int4\r
        AS 'MODULE_PATHNAME','LWGEOM_get_srid'\r