]> granicus.if.org Git - postgis/commitdiff
Fix geography/geometry casting issues in buffer tests
authorPaul Ramsey <pramsey@cleverelephant.ca>
Wed, 24 Feb 2016 16:12:33 +0000 (16:12 +0000)
committerPaul Ramsey <pramsey@cleverelephant.ca>
Wed, 24 Feb 2016 16:12:33 +0000 (16:12 +0000)
git-svn-id: http://svn.osgeo.org/postgis/trunk@14684 b70326c6-7e19-0410-871a-916f4a2858ee

postgis/geography.sql.in

index 9ab1844f108681f17ba47f75264a37b6aac49fef..1ef38ce931cf1aec6206c5d38b82bb7580d16002 100644 (file)
@@ -749,7 +749,19 @@ CREATE OR REPLACE FUNCTION ST_Buffer(geography, float8, integer)
        LANGUAGE 'sql' IMMUTABLE STRICT;
 
 -- Availability: 2.1.x
-CREATE OR REPLACE FUNCTION ST_Buffer(geography, float8, cstring)
+CREATE OR REPLACE FUNCTION ST_Buffer(geography, float8, text)
+       RETURNS geography
+       AS 'SELECT geography(ST_Transform(ST_Buffer(ST_Transform(geometry($1), _ST_BestSRID($1)), $2, $3), 4326))'
+       LANGUAGE 'sql' IMMUTABLE STRICT;
+
+-- Availability: 2.1.x
+CREATE OR REPLACE FUNCTION ST_Buffer(geography, float8, integer)
+       RETURNS geography
+       AS 'SELECT geography(ST_Transform(ST_Buffer(ST_Transform(geometry($1), _ST_BestSRID($1)), $2, $3), 4326))'
+       LANGUAGE 'sql' IMMUTABLE STRICT;
+
+-- Availability: 2.1.x
+CREATE OR REPLACE FUNCTION ST_Buffer(geography, float8, text)
        RETURNS geography
        AS 'SELECT geography(ST_Transform(ST_Buffer(ST_Transform(geometry($1), _ST_BestSRID($1)), $2, $3), 4326))'
        LANGUAGE 'sql' IMMUTABLE STRICT;
@@ -760,6 +772,16 @@ CREATE OR REPLACE FUNCTION ST_Buffer(text, float8)
        $$ SELECT ST_Buffer($1::geometry, $2);  $$
        LANGUAGE 'sql' IMMUTABLE STRICT;
 
+CREATE OR REPLACE FUNCTION ST_Buffer(text, float8, integer)
+       RETURNS geometry AS
+       $$ SELECT ST_Buffer($1::geometry, $2, $3);  $$
+       LANGUAGE 'sql' IMMUTABLE STRICT;
+
+CREATE OR REPLACE FUNCTION ST_Buffer(text, float8, text)
+       RETURNS geometry AS
+       $$ SELECT ST_Buffer($1::geometry, $2, $3);  $$
+       LANGUAGE 'sql' IMMUTABLE STRICT;
+
 -- Availability: 1.5.0
 CREATE OR REPLACE FUNCTION ST_Intersection(geography, geography)
        RETURNS geography