From 6d35d898fe0a5367c332a74e1f1073ff5864231b Mon Sep 17 00:00:00 2001 From: Paul Ramsey Date: Fri, 28 Aug 2015 12:33:26 +0000 Subject: [PATCH] Try to remove multiple signatures... git-svn-id: http://svn.osgeo.org/postgis/trunk@14023 b70326c6-7e19-0410-871a-916f4a2858ee --- postgis/postgis.sql.in | 12 +++--------- postgis/postgis_drop_after.sql | 1 + postgis/postgis_drop_before.sql | 2 ++ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in index e9476ea25..c862be4b2 100644 --- a/postgis/postgis.sql.in +++ b/postgis/postgis.sql.in @@ -1481,17 +1481,11 @@ CREATE OR REPLACE FUNCTION ST_AsEWKB(geometry,text) LANGUAGE 'c' IMMUTABLE STRICT; -- Availability: 2.0.0 -CREATE OR REPLACE FUNCTION ST_AsLatLonText(geometry, text) +CREATE OR REPLACE FUNCTION ST_AsLatLonText(geom geometry, tmpl text DEFAULT '') RETURNS text AS 'MODULE_PATHNAME','LWGEOM_to_latlon' LANGUAGE 'c' IMMUTABLE STRICT; --- Availability: 2.0.0 -CREATE OR REPLACE FUNCTION ST_AsLatLonText(geometry) - RETURNS text - AS $$ SELECT ST_AsLatLonText($1, '') $$ - LANGUAGE 'sql' IMMUTABLE STRICT; - -- Deprecation in 1.2.3 CREATE OR REPLACE FUNCTION GeomFromEWKB(bytea) RETURNS geometry @@ -2918,8 +2912,8 @@ CREATE OR REPLACE FUNCTION text(geometry) -- Deprecation in 1.2.3 CREATE OR REPLACE FUNCTION box3dtobox(box3d) RETURNS box - AS 'SELECT box($1)' - LANGUAGE 'sql' IMMUTABLE STRICT; + AS 'MODULE_PATHNAME','BOX3D_to_BOX' + LANGUAGE 'c' IMMUTABLE STRICT; CREATE OR REPLACE FUNCTION geometry(box2d) RETURNS geometry diff --git a/postgis/postgis_drop_after.sql b/postgis/postgis_drop_after.sql index ab9c8eda1..12e05301e 100644 --- a/postgis/postgis_drop_after.sql +++ b/postgis/postgis_drop_after.sql @@ -146,3 +146,4 @@ DROP FUNCTION IF EXISTS geography_gist_join_selectivity(internal, oid, internal, DROP FUNCTION IF EXISTS ST_AsBinary(text); -- deprecated in 2.0 DROP FUNCTION IF EXISTS postgis_uses_stats(); -- deprecated in 2.0 + diff --git a/postgis/postgis_drop_before.sql b/postgis/postgis_drop_before.sql index 365f61a3f..8e63186b8 100644 --- a/postgis/postgis_drop_before.sql +++ b/postgis/postgis_drop_before.sql @@ -61,6 +61,8 @@ $$ ; -- Going from multiple functions to default args -- Need to drop old multiple variants to not get in trouble. +DROP FUNCTION IF EXISTS ST_AsLatLonText(geometry); +DROP FUNCTION IF EXISTS ST_AsLatLonText(geometry, text); DROP FUNCTION IF EXISTS ST_AsTWKB(geometry,int4); DROP FUNCTION IF EXISTS ST_AsTWKB(geometry,int4,int8); DROP FUNCTION IF EXISTS ST_AsTWKB(geometry,int4,int8,boolean); -- 2.40.0