#1423 revision -- put back the strict but set default prefix to '' AND NULLIF it...

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

diff --git a/postgis/geography.sql.in.c b/postgis/geography.sql.in.c
index 6bffccd92670e0f11ce7671649d4e6666fc8d553..ff460b5aab5348d84c7e43527432e51e8f210301 100644 (file)
--- a/postgis/geography.sql.in.c
+++ b/postgis/geography.sql.in.c
@@ -428,10 +428,10 @@ CREATE OR REPLACE FUNCTION ST_AsGML(geog geography, maxdecimaldigits int4 DEFAUL
 
 -- ST_AsGML(version, geography, precision, option, prefix)
 -- Changed: 2.0.0 to use default args and allow named args
-CREATE OR REPLACE FUNCTION ST_AsGML(version int4, geog geography, maxdecimaldigits int4 DEFAULT 15, options int4 DEFAULT 0, nprefix text DEFAULT null)
+CREATE OR REPLACE FUNCTION ST_AsGML(version int4, geog geography, maxdecimaldigits int4 DEFAULT 15, options int4 DEFAULT 0, nprefix text DEFAULT '')
        RETURNS text
-       AS 'SELECT _ST_AsGML($1, $2, $3, $4, $5)'
-       LANGUAGE 'SQL' IMMUTABLE;
+       AS $$ SELECT _ST_AsGML($1, $2, $3, $4, NULLIF($5, ''));$$
+       LANGUAGE 'SQL' IMMUTABLE STRICT;
 
 --
 -- KML OUTPUT

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index 0eaa1f70c01c339fb4210435fed53d2d1b0af32c..2814face9341d49aba6aec7308f50230868dc87e 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -3170,7 +3170,7 @@ CREATE OR REPLACE FUNCTION _ST_AsGML(int4, geometry, int4, int4, text)
 -- Changed: 2.0.0 to have default args\r
 CREATE OR REPLACE FUNCTION ST_AsGML(geom geometry, maxdecimaldigits int4 DEFAULT 15, options int4 DEFAULT 0)\r
        RETURNS TEXT\r
-       AS 'SELECT _ST_AsGML(2, $1, $2, $3, null)'\r
+       AS $$ SELECT _ST_AsGML(2, $1, $2, $3, null); $$\r
        LANGUAGE 'SQL' IMMUTABLE STRICT;\r
 \r
 -- ST_AsGML(version, geom, precision, option)\r
@@ -3178,10 +3178,10 @@ CREATE OR REPLACE FUNCTION ST_AsGML(geom geometry, maxdecimaldigits int4 DEFAULT
 -- ST_AsGML(version, geom, precision, option, prefix)\r
 -- Availability: 2.0.0\r
 -- Changed: 2.0.0 to use default and named args\r
-CREATE OR REPLACE FUNCTION ST_AsGML(version int4, geom geometry, maxdecimaldigits int4 DEFAULT 15, options int4 DEFAULT 0, nprefix text DEFAULT null)\r
+CREATE OR REPLACE FUNCTION ST_AsGML(version int4, geom geometry, maxdecimaldigits int4 DEFAULT 15, options int4 DEFAULT 0, nprefix text DEFAULT '')\r
        RETURNS TEXT\r
-       AS 'SELECT _ST_AsGML($1, $2, $3, $4, $5)'\r
-       LANGUAGE 'SQL' IMMUTABLE;\r
+       AS $$ SELECT _ST_AsGML($1, $2, $3, $4, NULLIF($5, '')); $$\r
+       LANGUAGE 'SQL' IMMUTABLE STRICT;\r
 \r
 -----------------------------------------------------------------------\r
 -- KML OUTPUT\r