#1415 -- beginning support for options -- expose the currently useless opts flag

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

diff --git a/doc/reference_output.xml b/doc/reference_output.xml
index 98453df12ae5fcc97cd06a5798eb263f5aa8a2e3..eb030e0994ebb9fb91216ae8a03d3838549dab94 100644 (file)
--- a/doc/reference_output.xml
+++ b/doc/reference_output.xml
@@ -872,6 +872,7 @@ SELECT ST_AsGML(3, ST_GeomFromEWKT('POLYHEDRALSURFACE( ((0 0 0, 0 0 1, 0 1 1, 0
                                <funcdef>text <function>ST_AsX3D</function></funcdef>
                                <paramdef><type>geometry </type> <parameter>g1</parameter></paramdef>
                                <paramdef choice='opt'><type>integer </type> <parameter>prec=15</parameter></paramdef>
+                               <paramdef choice='opt'><type>integer </type> <parameter>opts=0</parameter></paramdef>
                        </funcprototype>
            </funcsynopsis>
          </refsynopsisdiv>

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index 1c7c211c517a12fb58e6fcf28df732d988c3ee29..6fac997b1a3db5611217363bb5003145c4678ba4 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -4770,9 +4770,9 @@ CREATE OR REPLACE FUNCTION _ST_AsX3D(int4, geometry, int4, int4, text)
        LANGUAGE 'C' IMMUTABLE;\r
        \r
 -- ST_AsX3D(geom, precision)\r
-CREATE OR REPLACE FUNCTION ST_AsX3D(geom geometry, prec integer DEFAULT 15)\r
+CREATE OR REPLACE FUNCTION ST_AsX3D(geom geometry, prec integer DEFAULT 15, opts integer DEFAULT 0)\r
        RETURNS TEXT\r
-       AS $$SELECT _ST_AsX3D(3,$1,$2,1,'');$$\r
+       AS $$SELECT _ST_AsX3D(3,$1,$2,$3,'');$$\r
        LANGUAGE 'sql' IMMUTABLE;\r
 \r
 COMMIT;\r

diff --git a/postgis/postgis_drop.sql.in.c b/postgis/postgis_drop.sql.in.c
index 9013fa055fafa91fae9621199437ebf35ab48966..bacd2dd13378284184b90783f649eff0e9d339c8 100644 (file)
--- a/postgis/postgis_drop.sql.in.c
+++ b/postgis/postgis_drop.sql.in.c
@@ -28,6 +28,7 @@ DROP FUNCTION IF EXISTS box2d_same(box2d, box2d);
 DROP FUNCTION IF EXISTS box2d_intersects(box2d, box2d);
 DROP FUNCTION IF EXISTS st_area(geography); -- this one changed to use default parameters
 DROP FUNCTION IF EXISTS st_asx3d(geometry); -- this one changed to use default parameters so full function deals with it
+DROP FUNCTION IF EXISTS st_asx3d(geometry, int4); -- introduce variant with opts so get rid of other without ops
 DROP FUNCTION IF EXISTS st_assvg(geometry); -- changed to use default args
 DROP FUNCTION IF EXISTS st_assvg(geometry,int4); -- changed to use default args
 DROP FUNCTION IF EXISTS st_assvg(geography); -- changed to use default args