reduce ST_MakeEnvelope down to one function but make srid default to 0 (would be...

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

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index 8ecc5e9533dbe3dac09a1c856e2f0066ec8548de..5a902c1513c650d394a8f1837c74b931ceeb5880 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -1125,13 +1125,8 @@ CREATE OR REPLACE FUNCTION ST_SetPoint(geometry, integer, geometry)
        LANGUAGE 'C' IMMUTABLE STRICT;\r
 \r
 -- Availability: 1.5.0\r
-CREATE OR REPLACE FUNCTION ST_MakeEnvelope(float8, float8, float8, float8, integer)\r
-       RETURNS geometry\r
-       AS 'MODULE_PATHNAME', 'ST_MakeEnvelope'\r
-       LANGUAGE 'C' IMMUTABLE STRICT;\r
-\r
--- Availability: 2.0.0\r
-CREATE OR REPLACE FUNCTION ST_MakeEnvelope(float8, float8, float8, float8)\r
+-- Availability: 2.0.0 - made srid optional\r
+CREATE OR REPLACE FUNCTION ST_MakeEnvelope(float8, float8, float8, float8, integer DEFAULT 0)\r
        RETURNS geometry\r
        AS 'MODULE_PATHNAME', 'ST_MakeEnvelope'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r

diff --git a/postgis/postgis_drop_before.sql.in.c b/postgis/postgis_drop_before.sql.in.c
index c9d8f1b575bb9cc8b3d56b9c58c6f789b71c92bc..ff3d870e871b27a2b0f2d8b29fb64d49c92a1abd 100644 (file)
--- a/postgis/postgis_drop_before.sql.in.c
+++ b/postgis/postgis_drop_before.sql.in.c
@@ -2,3 +2,4 @@
 -- These are functions where the argument names may have changed  --
 -- so have to be dropped before upgrade can happen --
 DROP FUNCTION IF EXISTS AddGeometryColumn(varchar,varchar,varchar,varchar,integer,varchar,integer,boolean);
+DROP FUNCTION IF EXISTS ST_MakeEnvelope(float8, float8, float8, float8);