From 4aef5872778b6dcd6038729a1d2970c5f3da532f Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Sun, 1 Jan 2012 04:38:18 +0000 Subject: [PATCH] #1423: ST_AsGML regress fixes -- bah revert last change evidentally '' and NULL prefix do not mean the same thing. git-svn-id: http://svn.osgeo.org/postgis/trunk@8635 b70326c6-7e19-0410-871a-916f4a2858ee --- postgis/geography.sql.in.c | 6 +++--- postgis/postgis.sql.in.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/postgis/geography.sql.in.c b/postgis/geography.sql.in.c index ff460b5aa..4d60e67af 100644 --- 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 2814face9..49b41f0b1 100644 --- 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) -- Availability: 2.0.0 -- Changed: 2.0.0 to use default and named args -CREATE OR REPLACE FUNCTION ST_AsGML(version int4, geom geometry, maxdecimaldigits int4 DEFAULT 15, options int4 DEFAULT 0, nprefix text DEFAULT '') +CREATE OR REPLACE FUNCTION ST_AsGML(version int4, geom geometry, 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 -- 2.40.0