#2661: st_astwkb_agg(geometry,int) needs code comment and violates naming convention...

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

diff --git a/doc/reference_output.xml b/doc/reference_output.xml
index 3f2e6996dce0e383ec33374689b6340746945d17..390666cfa03376ad68d490364385a6d3090512e7 100644 (file)
--- a/doc/reference_output.xml
+++ b/doc/reference_output.xml
@@ -1196,25 +1196,25 @@ SELECT ST_AsTWKB('LINESTRING(1 1,5 5)'::geometry,0,1);
 
                  <refsection>
                        <title>See Also</title>
-                       <para><xref linkend="ST_AsTWKB_agg" /><xref linkend="ST_AsBinary" />, <xref linkend="ST_AsEWKB" />, <xref linkend="ST_AsEWKT" />, <xref linkend="ST_GeomFromText" /></para>
+                       <para><xref linkend="ST_AsTWKBAgg" /><xref linkend="ST_AsBinary" />, <xref linkend="ST_AsEWKB" />, <xref linkend="ST_AsEWKT" />, <xref linkend="ST_GeomFromText" /></para>
                  </refsection>
        </refentry>
 
-       <refentry id="ST_AsTWKB_agg">
+       <refentry id="ST_AsTWKBAgg">
                  <refnamediv>
-                       <refname>ST_AsTWKB_agg</refname>
+                       <refname>ST_AsTWKBAgg</refname>
                        <refpurpose>Aggregates the geometries and returns as TWKB</refpurpose>
                  </refnamediv>
 
                  <refsynopsisdiv>
                        <funcsynopsis>
                          <funcprototype>
-                               <funcdef>bytea <function>ST_AsTWKB_agg</function></funcdef>
+                               <funcdef>bytea <function>ST_AsTWKBAgg</function></funcdef>
                                <paramdef><type>geometry </type> <parameter>g1</parameter></paramdef>
                                <paramdef><type>integer </type> <parameter>decimaldigits</parameter></paramdef>
                          </funcprototype>
                          <funcprototype>
-                               <funcdef>bytea <function>ST_AsTWKB_agg</function></funcdef>
+                               <funcdef>bytea <function>ST_AsTWKBAgg</function></funcdef>
                                <paramdef><type>geometry </type> <parameter>g1</parameter></paramdef>
                                <paramdef><type>integer </type> <parameter>decimaldigits</parameter></paramdef>
                                <paramdef><type>int8 </type> <parameter>geometryID</parameter></paramdef>
@@ -1234,18 +1234,18 @@ SELECT ST_AsTWKB('LINESTRING(1 1,5 5)'::geometry,0,1);
                        </note>
                                
 
-                       <para>Availability: 2.2</para>
+                       <para>Availability: 2.2.0</para>
                  </refsection>
 
 
                  <refsection>
                        <title>Examples</title>
 <programlisting>
-SELECT ST_AsTWKB_agg(geom,0,id) FROM
+SELECT ST_AsTWKBAgg(geom,0,id) FROM
 (SELECT 'LINESTRING(1 1,5 5)'::geometry geom, 1 AS id
 UNION ALL
 SELECT 'LINESTRING(6 5, 1 7)'::geometry AS geom, 2 AS id) foo;
-                               st_astwkb_agg                                
+                               st_astwkbagg                                
 ----------------------------------------------------------------------------
 \x035602010202020808020202000904
 </programlisting>
@@ -1253,7 +1253,7 @@ SELECT 'LINESTRING(6 5, 1 7)'::geometry AS geom, 2 AS id) foo;
                  <!-- Optionally add a "See Also" section -->
                  <refsection>
                        <title>See Also</title>
-                       <para><xref linkend="ST_AsTWKB" /><xref linkend="ST_AsBinary" />, <xref linkend="ST_AsEWKB" />, <xref linkend="ST_AsEWKT" />, <xref linkend="ST_GeomFromText" /></para>
+                       <para><xref linkend="ST_AsTWKB" />, <xref linkend="ST_AsBinary" />, <xref linkend="ST_AsEWKB" />, <xref linkend="ST_AsEWKT" />, <xref linkend="ST_GeomFromText" /></para>
                  </refsection>
 </refentry>
   </sect1>

diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in
index de7203c393ad20e477e54d2cc29b5c0398fa61de..97832734cba10b447702cb7f54d17846dbe99e40 100644 (file)
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -3365,29 +3365,32 @@ CREATE OR REPLACE FUNCTION pgis_geometry_makeline_finalfn(pgis_abs)
        LANGUAGE 'c';
 
 --Availability: 2.2.0
-
 CREATE OR REPLACE FUNCTION pgis_twkb_accum_transfn(internal, geometry,int)
   RETURNS internal
        AS 'MODULE_PATHNAME'
   LANGUAGE c ;
-  
+
+-- Availability: 2.2.0  
 CREATE OR REPLACE FUNCTION pgis_twkb_accum_transfn(internal, geometry,int,int8)
   RETURNS internal
        AS 'MODULE_PATHNAME'
   LANGUAGE c ;
 
+-- Availability: 2.2.0  
 CREATE OR REPLACE FUNCTION pgis_twkb_accum_finalfn(internal)
   RETURNS bytea
        AS 'MODULE_PATHNAME'
   LANGUAGE c ;
 
-CREATE AGGREGATE st_astwkb_agg(geometry,int) (
+-- Availability: 2.2.0  
+CREATE AGGREGATE st_astwkbagg(geometry,int) (
   SFUNC=pgis_twkb_accum_transfn,
   STYPE=internal,
   FINALFUNC=pgis_twkb_accum_finalfn
 );
 
-CREATE AGGREGATE st_astwkb_agg(geometry,int,int8) (
+-- Availability: 2.2.0
+CREATE AGGREGATE st_astwkbagg(geometry,int,int8) (
   SFUNC=pgis_twkb_accum_transfn,
   STYPE=internal,
   FINALFUNC=pgis_twkb_accum_finalfn