#1423: ST_AsGML regress fixes -- bah revert last change evidentally '' and NULL prefi...

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

diff --git a/postgis/geography.sql.in.c b/postgis/geography.sql.in.c
index ff460b5aab5348d84c7e43527432e51e8f210301..4d60e67af7ee31fc92b865eb7333384aff864213 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 '')
+CREATE OR REPLACE FUNCTION ST_AsGML(version int4, geog geography, maxdecimaldigits int4 DEFAULT 15, options int4 DEFAULT 0, nprefix text DEFAULT NULL)
        RETURNS text
-       AS $$ SELECT _ST_AsGML($1, $2, $3, $4, NULLIF($5, ''));$$
-       LANGUAGE 'SQL' IMMUTABLE STRICT;
+       AS $$ SELECT _ST_AsGML($1, $2, $3, $4, $5);$$
+       LANGUAGE 'SQL' IMMUTABLE;
 
 --
 -- KML OUTPUT

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index 2814face9341d49aba6aec7308f50230868dc87e..49b41f0b18a302dae671dd3d57bef39e36c5cebd 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -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 '')\r
+CREATE OR REPLACE FUNCTION ST_AsGML(version int4, geom geometry, maxdecimaldigits int4 DEFAULT 15, options int4 DEFAULT 0, nprefix text DEFAULT null)\r
        RETURNS TEXT\r
-       AS $$ SELECT _ST_AsGML($1, $2, $3, $4, NULLIF($5, '')); $$\r
-       LANGUAGE 'SQL' IMMUTABLE STRICT;\r
+       AS $$ SELECT _ST_AsGML($1, $2, $3, $4,$5); $$\r
+       LANGUAGE 'SQL' IMMUTABLE;\r
 \r
 -----------------------------------------------------------------------\r
 -- KML OUTPUT\r