[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0beta2-16-g6906e4079

git at osgeo.org git at osgeo.org
Mon Jul 25 12:41:50 PDT 2022


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  6906e4079c1c084006af1aabdfc70c99b4286165 (commit)
       via  7ce341c52a38b42ec63b901668eabba5d8ff3b2d (commit)
      from  97de4484e6f0b14607ed14fd7cc6ca1fe364eaef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6906e4079c1c084006af1aabdfc70c99b4286165
Author: Regina Obe <lr at pcorp.us>
Date:   Mon Jul 25 15:38:55 2022 -0400

    Use read only SPI to maintain parallel safety
    for ST_AsGeoJSON and ST_AsGML
    References #5139 for PostGIS 3.3.0
    Using same solution from #3952

diff --git a/NEWS b/NEWS
index 899435b90..e77dfc2c9 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,9 @@ Changes since PostGIS 3.3.0beta2:
            to be tolerant of small 32-bit floating point differences
            (Regina Obe)
   - #5191, Functions should use integer instead of int4 (Regina Obe)
+  - #5139, PostGIS causes to_jsonb to no longer be parallel safe,
+           ST_AsGeoJSON and ST_AsGML are also parallel unsafe
+           (Regina Obe, Paul Ramsey)
 
 
 
diff --git a/libpgcommon/lwgeom_cache.c b/libpgcommon/lwgeom_cache.c
index f6934b387..7e013895d 100644
--- a/libpgcommon/lwgeom_cache.c
+++ b/libpgcommon/lwgeom_cache.c
@@ -297,7 +297,7 @@ getSRSbySRID(FunctionCallInfo fcinfo, int32_t srid, bool short_crs)
 			 postgis_spatial_ref_sys(),
 			 srid);
 
-	err = SPI_exec(query, 1);
+	err = SPI_execute(query, true, 1);
 	if (err < 0)
 	{
 		elog(NOTICE, "%s: error executing query %d", __func__, err);

commit 7ce341c52a38b42ec63b901668eabba5d8ff3b2d
Author: Regina Obe <lr at pcorp.us>
Date:   Mon Jul 25 15:24:30 2022 -0400

    Use integer instead of int4.  References #5191 for PostGIS 3.3.0. For raster, geography, and legacy

diff --git a/postgis/geography.sql.in b/postgis/geography.sql.in
index 372124147..c48a4117d 100644
--- a/postgis/geography.sql.in
+++ b/postgis/geography.sql.in
@@ -106,7 +106,7 @@ CREATE OR REPLACE FUNCTION ST_AsText(geography)
 	_COST_MEDIUM;
 
 -- Availability: 2.5.0
-CREATE OR REPLACE FUNCTION ST_AsText(geography, int4)
+CREATE OR REPLACE FUNCTION ST_AsText(geography, integer)
 	RETURNS TEXT
 	AS 'MODULE_PATHNAME','LWGEOM_asText'
 	LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
@@ -206,7 +206,7 @@ CREATE CAST (geography AS geometry) WITH FUNCTION geometry(geography) ;
 -- ---------- ---------- ---------- ---------- ---------- ---------- ----------
 
 -- Availability: 1.5.0
-CREATE OR REPLACE FUNCTION geography_gist_consistent(internal,geography,int4)
+CREATE OR REPLACE FUNCTION geography_gist_consistent(internal,geography,integer)
 	RETURNS bool
 	AS 'MODULE_PATHNAME' ,'gserialized_gist_consistent'
 	LANGUAGE 'c';
@@ -275,7 +275,7 @@ CREATE OPERATOR <-> (
 );
 
 -- Availability: 2.2.0
-CREATE OR REPLACE FUNCTION geography_gist_distance(internal, geography, int4)
+CREATE OR REPLACE FUNCTION geography_gist_distance(internal, geography, integer)
 	RETURNS float8
 	AS 'MODULE_PATHNAME' ,'gserialized_gist_geog_distance'
 	LANGUAGE 'c';
@@ -292,8 +292,8 @@ CREATE OPERATOR CLASS gist_geography_ops
 -- Availability: 2.2.0
 	OPERATOR        13       <-> FOR ORDER BY pg_catalog.float_ops,
 -- Availability: 2.2.0
-	FUNCTION        8        geography_gist_distance (internal, geography, int4),
-	FUNCTION        1        geography_gist_consistent (internal, geography, int4),
+	FUNCTION        8        geography_gist_distance (internal, geography, integer),
+	FUNCTION        1        geography_gist_consistent (internal, geography, integer),
 	FUNCTION        2        geography_gist_union (bytea, internal),
 	FUNCTION        3        geography_gist_compress (internal),
 	FUNCTION        4        geography_gist_decompress (internal),
@@ -404,7 +404,7 @@ CREATE OPERATOR CLASS btree_geography_ops
 --
 
 -- Changed 2.0.0 to use default args and named args
-CREATE OR REPLACE FUNCTION ST_AsSVG(geog geography, rel int4 DEFAULT 0, maxdecimaldigits int4 DEFAULT 15)
+CREATE OR REPLACE FUNCTION ST_AsSVG(geog geography, rel integer DEFAULT 0, maxdecimaldigits integer DEFAULT 15)
 	RETURNS text
 	AS 'MODULE_PATHNAME','geography_as_svg'
 	LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
@@ -426,13 +426,13 @@ CREATE OR REPLACE FUNCTION ST_AsSVG(text)
 -- Changed: 2.0.0 to use default args and allow named args
 -- Changed: 2.1.0 enhance to allow id value
 -- Availability: 1.5.0
-CREATE OR REPLACE FUNCTION ST_AsGML(version int4, geog geography, maxdecimaldigits int4 DEFAULT 15, options int4 DEFAULT 0, nprefix text DEFAULT 'gml', id text DEFAULT '')
+CREATE OR REPLACE FUNCTION ST_AsGML(version integer, geog geography, maxdecimaldigits integer DEFAULT 15, options integer DEFAULT 0, nprefix text DEFAULT 'gml', id text DEFAULT '')
 	RETURNS text
 	AS 'MODULE_PATHNAME','geography_as_gml'
 	LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
 	_COST_MEDIUM;
 
-CREATE OR REPLACE FUNCTION ST_AsGML(geog geography, maxdecimaldigits int4 DEFAULT 15, options int4 DEFAULT 0, nprefix text DEFAULT 'gml', id text DEFAULT '')
+CREATE OR REPLACE FUNCTION ST_AsGML(geog geography, maxdecimaldigits integer DEFAULT 15, options integer DEFAULT 0, nprefix text DEFAULT 'gml', id text DEFAULT '')
 	RETURNS text
 	AS 'MODULE_PATHNAME','geography_as_gml'
 	LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
@@ -452,8 +452,8 @@ CREATE OR REPLACE FUNCTION ST_AsGML(text)
 
 -- AsKML(geography,precision)
 -- Changed: 2.0.0 to use default args and named args
--- Replaces ST_AsKML(geography, int4) deprecated in 2.0.0
-CREATE OR REPLACE FUNCTION ST_AsKML(geog geography, maxdecimaldigits int4 DEFAULT 15, nprefix text DEFAULT '')
+-- Replaces ST_AsKML(geography, integer) deprecated in 2.0.0
+CREATE OR REPLACE FUNCTION ST_AsKML(geog geography, maxdecimaldigits integer DEFAULT 15, nprefix text DEFAULT '')
 	RETURNS text
 	AS 'MODULE_PATHNAME','geography_as_kml'
 	LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
@@ -471,7 +471,7 @@ CREATE OR REPLACE FUNCTION ST_AsKML(text)
 -- GeoJson Output
 --
 
-CREATE OR REPLACE FUNCTION ST_AsGeoJson(geog geography, maxdecimaldigits int4 DEFAULT 9, options int4 DEFAULT 0)
+CREATE OR REPLACE FUNCTION ST_AsGeoJson(geog geography, maxdecimaldigits integer DEFAULT 9, options integer DEFAULT 0)
 	RETURNS text
 	AS 'MODULE_PATHNAME','geography_as_geojson'
 	LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
@@ -711,7 +711,7 @@ CREATE OR REPLACE FUNCTION ST_AsEWKT(geography)
 	LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
 	_COST_MEDIUM;
 
-CREATE OR REPLACE FUNCTION ST_AsEWKT(geography, int4)
+CREATE OR REPLACE FUNCTION ST_AsEWKT(geography, integer)
 	RETURNS TEXT
 	AS 'MODULE_PATHNAME','LWGEOM_asEWKT'
 	LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
@@ -738,7 +738,7 @@ CREATE OR REPLACE FUNCTION ST_Summary(geography)
 	_COST_LOW;
 
 -- Availability: 2.1.0
-CREATE OR REPLACE FUNCTION ST_GeoHash(geog geography, maxchars int4 DEFAULT 0)
+CREATE OR REPLACE FUNCTION ST_GeoHash(geog geography, maxchars integer DEFAULT 0)
 	RETURNS TEXT
 	AS 'MODULE_PATHNAME', 'ST_GeoHash'
 	LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
@@ -746,13 +746,13 @@ CREATE OR REPLACE FUNCTION ST_GeoHash(geog geography, maxchars int4 DEFAULT 0)
 
 -- Availability: 2.2.0
 CREATE OR REPLACE FUNCTION ST_SRID(geog geography)
-	RETURNS int4
+	RETURNS integer
 	AS 'MODULE_PATHNAME', 'LWGEOM_get_srid'
 	LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
 	_COST_LOW;
 
 -- Availability: 2.2.0
-CREATE OR REPLACE FUNCTION ST_SetSRID(geog geography, srid int4)
+CREATE OR REPLACE FUNCTION ST_SetSRID(geog geography, srid integer)
 	RETURNS geography
 	AS 'MODULE_PATHNAME', 'LWGEOM_set_srid'
 	LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
diff --git a/postgis/legacy.sql.in b/postgis/legacy.sql.in
index c90452aee..9c90a154a 100644
--- a/postgis/legacy.sql.in
+++ b/postgis/legacy.sql.in
@@ -23,12 +23,12 @@ CREATE OR REPLACE FUNCTION hasbbox(geometry)
 
 -- Availability: 1.2.2 -- never deprecated but don't think anyone uses it
 CREATE OR REPLACE FUNCTION getsrid(geometry)
-	RETURNS int4
+	RETURNS integer
 	AS 'MODULE_PATHNAME','LWGEOM_get_srid'
 	LANGUAGE 'c' IMMUTABLE STRICT;
 
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION GeometryFromText(text, int4)
+CREATE OR REPLACE FUNCTION GeometryFromText(text, integer)
 	RETURNS geometry
 	AS 'MODULE_PATHNAME','LWGEOM_from_text'
 	LANGUAGE 'c' IMMUTABLE STRICT;
@@ -597,14 +597,14 @@ CREATE OR REPLACE FUNCTION AsGML(geometry)
 	LANGUAGE 'sql' IMMUTABLE STRICT;
 
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION AsGML(geometry, int4)
+CREATE OR REPLACE FUNCTION AsGML(geometry, integer)
 	RETURNS TEXT
 	AS 'SELECT _ST_AsGML(2, $1, $2, 0, null, null)'
 	LANGUAGE 'sql' IMMUTABLE STRICT;
 
 -- AsKML(geom, precision) / version=2
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION AsKML(geometry, int4)
+CREATE OR REPLACE FUNCTION AsKML(geometry, integer)
 	RETURNS TEXT
 	AS 'SELECT ST_AsKML(ST_transform($1,4326), $2, null)'
 	LANGUAGE 'sql' IMMUTABLE STRICT;
@@ -618,7 +618,7 @@ CREATE OR REPLACE FUNCTION AsKML(geometry)
 
 -- AsKML(version, geom, precision)
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION AsKML(int4, geometry, int4)
+CREATE OR REPLACE FUNCTION AsKML(integer, geometry, integer)
 	RETURNS TEXT
 	AS 'SELECT ST_AsKML(ST_Transform($2,4326), $3, null)'
 	LANGUAGE 'sql' IMMUTABLE STRICT;
@@ -642,13 +642,13 @@ CREATE OR REPLACE FUNCTION AsSVG(geometry)
 	LANGUAGE 'c' IMMUTABLE STRICT;
 
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION AsSVG(geometry,int4)
+CREATE OR REPLACE FUNCTION AsSVG(geometry,integer)
 	RETURNS TEXT
 	AS 'MODULE_PATHNAME','LWGEOM_asSVG'
 	LANGUAGE 'c' IMMUTABLE STRICT;
 
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION AsSVG(geometry,int4,int4)
+CREATE OR REPLACE FUNCTION AsSVG(geometry,integer,integer)
 	RETURNS TEXT
 	AS 'MODULE_PATHNAME','LWGEOM_asSVG'
 	LANGUAGE 'c' IMMUTABLE STRICT;
@@ -778,7 +778,7 @@ CREATE OR REPLACE FUNCTION difference(geometry,geometry)
 
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION Dimension(geometry)
-	RETURNS int4
+	RETURNS integer
 	AS 'MODULE_PATHNAME', 'LWGEOM_dimension'
 	LANGUAGE 'c' IMMUTABLE STRICT;
 
@@ -934,7 +934,7 @@ CREATE OR REPLACE FUNCTION ForceRHR(geometry)
 	LANGUAGE 'c' IMMUTABLE STRICT;
 
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION GeomCollFromText(text, int4)
+CREATE OR REPLACE FUNCTION GeomCollFromText(text, integer)
 	RETURNS geometry
 	AS '
 	SELECT CASE
@@ -1178,7 +1178,7 @@ CREATE OR REPLACE FUNCTION LineFromText(text)
 	LANGUAGE 'sql' IMMUTABLE STRICT;
 
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION LineFromText(text, int4)
+CREATE OR REPLACE FUNCTION LineFromText(text, integer)
 	RETURNS geometry
 	AS '
 	SELECT CASE WHEN geometrytype(GeomFromText($1, $2)) = ''LINESTRING''
@@ -1220,7 +1220,7 @@ CREATE OR REPLACE FUNCTION LineStringFromText(text)
 	LANGUAGE 'sql' IMMUTABLE STRICT;
 
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION LineStringFromText(text, int4)
+CREATE OR REPLACE FUNCTION LineStringFromText(text, integer)
 	RETURNS geometry
 	AS 'SELECT LineFromText($1, $2)'
 	LANGUAGE 'sql' IMMUTABLE STRICT;
@@ -1316,12 +1316,12 @@ CREATE OR REPLACE FUNCTION max_distance(geometry,geometry)
 
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION mem_size(geometry)
-	RETURNS int4
+	RETURNS integer
 	AS 'MODULE_PATHNAME', 'LWGEOM_mem_size'
 	LANGUAGE 'c' IMMUTABLE STRICT;
 
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION MLineFromText(text, int4)
+CREATE OR REPLACE FUNCTION MLineFromText(text, integer)
 	RETURNS geometry
 	AS '
 	SELECT CASE
@@ -1362,7 +1362,7 @@ CREATE OR REPLACE FUNCTION MLineFromWKB(bytea)
 	LANGUAGE 'sql' IMMUTABLE STRICT;
 
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION MPointFromText(text, int4)
+CREATE OR REPLACE FUNCTION MPointFromText(text, integer)
 	RETURNS geometry
 	AS '
 	SELECT CASE WHEN geometrytype(GeomFromText($1,$2)) = ''MULTIPOINT''
@@ -1402,7 +1402,7 @@ CREATE OR REPLACE FUNCTION MPointFromWKB(bytea)
 	LANGUAGE 'sql' IMMUTABLE STRICT;
 
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION MPolyFromText(text, int4)
+CREATE OR REPLACE FUNCTION MPolyFromText(text, integer)
 	RETURNS geometry
 	AS '
 	SELECT CASE WHEN geometrytype(GeomFromText($1, $2)) = ''MULTIPOLYGON''
@@ -1468,7 +1468,7 @@ CREATE OR REPLACE FUNCTION MultiLineStringFromText(text)
 	LANGUAGE 'sql' IMMUTABLE STRICT;
 
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION MultiLineStringFromText(text, int4)
+CREATE OR REPLACE FUNCTION MultiLineStringFromText(text, integer)
 	RETURNS geometry
 	AS 'SELECT MLineFromText($1, $2)'
 	LANGUAGE 'sql' IMMUTABLE STRICT;
@@ -1486,7 +1486,7 @@ CREATE OR REPLACE FUNCTION MultiPointFromText(text)
 	LANGUAGE 'sql' IMMUTABLE STRICT;
 
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION MultiPointFromText(text, int4)
+CREATE OR REPLACE FUNCTION MultiPointFromText(text, integer)
 	RETURNS geometry
 	AS 'SELECT MPointFromText($1, $2)'
 	LANGUAGE 'sql' IMMUTABLE STRICT;
@@ -1512,7 +1512,7 @@ CREATE OR REPLACE FUNCTION MultiPointFromWKB(bytea)
 	LANGUAGE 'sql' IMMUTABLE STRICT;
 
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION MultiPolygonFromText(text, int4)
+CREATE OR REPLACE FUNCTION MultiPolygonFromText(text, integer)
 	RETURNS geometry
 	AS 'SELECT MPolyFromText($1, $2)'
 	LANGUAGE 'sql' IMMUTABLE STRICT;
@@ -1537,25 +1537,25 @@ CREATE OR REPLACE FUNCTION NumInteriorRings(geometry)
 
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION npoints(geometry)
-	RETURNS int4
+	RETURNS integer
 	AS 'MODULE_PATHNAME', 'LWGEOM_npoints'
 	LANGUAGE 'c' IMMUTABLE STRICT;
 
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION nrings(geometry)
-	RETURNS int4
+	RETURNS integer
 	AS 'MODULE_PATHNAME', 'LWGEOM_nrings'
 	LANGUAGE 'c' IMMUTABLE STRICT;
 
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION NumGeometries(geometry)
-	RETURNS int4
+	RETURNS integer
 	AS 'MODULE_PATHNAME', 'LWGEOM_numgeometries_collection'
 	LANGUAGE 'c' IMMUTABLE STRICT;
 
 -- Deprecation in 1.2.3
 CREATE OR REPLACE FUNCTION NumPoints(geometry)
-	RETURNS int4
+	RETURNS integer
 	AS 'MODULE_PATHNAME', 'LWGEOM_numpoints_linestring'
 	LANGUAGE 'c' IMMUTABLE STRICT;
 
@@ -1596,7 +1596,7 @@ CREATE OR REPLACE FUNCTION PointFromText(text)
 	LANGUAGE 'sql' IMMUTABLE STRICT;
 
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION PointFromText(text, int4)
+CREATE OR REPLACE FUNCTION PointFromText(text, integer)
 	RETURNS geometry
 	AS '
 	SELECT CASE WHEN geometrytype(GeomFromText($1, $2)) = ''POINT''
@@ -1647,7 +1647,7 @@ CREATE OR REPLACE FUNCTION PolyFromText(text)
 	'
 	LANGUAGE 'sql' IMMUTABLE STRICT;
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION PolyFromText(text, int4)
+CREATE OR REPLACE FUNCTION PolyFromText(text, integer)
 	RETURNS geometry
 	AS '
 	SELECT CASE WHEN geometrytype(GeomFromText($1, $2)) = ''POLYGON''
@@ -1677,7 +1677,7 @@ CREATE OR REPLACE FUNCTION PolyFromWKB(bytea)
 	LANGUAGE 'sql' IMMUTABLE STRICT;
 
 -- Deprecation in 1.2.3
-CREATE OR REPLACE FUNCTION PolygonFromText(text, int4)
+CREATE OR REPLACE FUNCTION PolygonFromText(text, integer)
 	RETURNS geometry
 	AS 'SELECT PolyFromText($1, $2)'
 	LANGUAGE 'sql' IMMUTABLE STRICT;
@@ -1950,7 +1950,7 @@ CREATE OR REPLACE FUNCTION ST_find_extent(text,text)
 -- Availability: 1.2.2
 -- Deprecation in 2.2.0
 CREATE OR REPLACE FUNCTION ST_mem_size(geometry)
-	RETURNS int4 AS
+	RETURNS integer AS
   	'SELECT ST_MemSize($1);'
 	LANGUAGE 'sql' IMMUTABLE STRICT SECURITY INVOKER;
 
@@ -2191,22 +2191,22 @@ CREATE AGGREGATE ST_Extent3D(
 -- Versioned Format Export Functions --
 ------------------------------------------------
 
-CREATE OR REPLACE FUNCTION ST_AsGeoJson(version int4, geog geography, maxdecimaldigits int4 DEFAULT 15, options int4 DEFAULT 0)
+CREATE OR REPLACE FUNCTION ST_AsGeoJson(version integer, geog geography, maxdecimaldigits integer DEFAULT 15, options integer DEFAULT 0)
 	RETURNS text AS
 	$$ SELECT ST_AsGeoJson($2::geometry,$3,$4); $$
 	LANGUAGE 'sql' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION ST_AsGeoJson(version int4, geog geometry, maxdecimaldigits int4 DEFAULT 15, options int4 DEFAULT 0)
+CREATE OR REPLACE FUNCTION ST_AsGeoJson(version integer, geog geometry, maxdecimaldigits integer DEFAULT 15, options integer DEFAULT 0)
 	RETURNS text AS
 	$$ SELECT ST_AsGeoJson($2::geometry,15,0); $$
 	LANGUAGE 'sql' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION ST_AsKML(version int4, geom geography, maxdecimaldigits int4 DEFAULT 15, nprefix TEXT default '')
+CREATE OR REPLACE FUNCTION ST_AsKML(version integer, geom geography, maxdecimaldigits integer DEFAULT 15, nprefix TEXT default '')
 	RETURNS text AS
 	$$ SELECT ST_AsKML($2::geometry,$3,$4); $$
 	LANGUAGE 'sql' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION ST_AsKML(version int4, geom geometry, maxdecimaldigits int4 DEFAULT 15, nprefix TEXT default '')
+CREATE OR REPLACE FUNCTION ST_AsKML(version integer, geom geometry, maxdecimaldigits integer DEFAULT 15, nprefix TEXT default '')
 	RETURNS text AS
 	$$ SELECT ST_AsKML($2::geometry,$3,$4); $$
 	LANGUAGE 'sql' IMMUTABLE STRICT;
diff --git a/raster/rt_pg/rtpostgis.sql.in b/raster/rt_pg/rtpostgis.sql.in
index 0726acf51..7330e065a 100644
--- a/raster/rt_pg/rtpostgis.sql.in
+++ b/raster/rt_pg/rtpostgis.sql.in
@@ -327,14 +327,14 @@ CREATE OR REPLACE FUNCTION st_summary(rast raster)
 
 -- Availability: 2.2.0
 CREATE OR REPLACE FUNCTION ST_MemSize(raster)
-	RETURNS int4
+	RETURNS integer
 	AS 'MODULE_PATHNAME', 'RASTER_memsize'
 	LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE;
 
 -----------------------------------------------------------------------
 -- Constructor ST_MakeEmptyRaster
 -----------------------------------------------------------------------
-CREATE OR REPLACE FUNCTION st_makeemptyraster(width int, height int, upperleftx float8, upperlefty float8, scalex float8, scaley float8, skewx float8, skewy float8, srid int4 DEFAULT 0)
+CREATE OR REPLACE FUNCTION st_makeemptyraster(width int, height int, upperleftx float8, upperlefty float8, scalex float8, scaley float8, skewx float8, skewy float8, srid integer DEFAULT 0)
     RETURNS RASTER
     AS 'MODULE_PATHNAME', 'RASTER_makeEmpty'
     LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE;
@@ -8758,7 +8758,7 @@ END;
 $$ LANGUAGE 'plpgsql' VOLATILE STRICT;
 
 -- Availability: 2.4.0
-CREATE OR REPLACE FUNCTION st_makeemptycoverage(tilewidth int, tileheight int, width int, height int, upperleftx float8, upperlefty float8, scalex float8, scaley float8, skewx float8, skewy float8, srid int4 DEFAULT 0)
+CREATE OR REPLACE FUNCTION st_makeemptycoverage(tilewidth int, tileheight int, width int, height int, upperleftx float8, upperlefty float8, scalex float8, scaley float8, skewx float8, skewy float8, srid integer DEFAULT 0)
     RETURNS SETOF RASTER AS $$
     DECLARE
         ulx double precision;  -- upper left x of raster

-----------------------------------------------------------------------

Summary of changes:
 NEWS                          |  3 +++
 libpgcommon/lwgeom_cache.c    |  2 +-
 postgis/geography.sql.in      | 30 +++++++++++-----------
 postgis/legacy.sql.in         | 60 +++++++++++++++++++++----------------------
 raster/rt_pg/rtpostgis.sql.in |  6 ++---
 5 files changed, 52 insertions(+), 49 deletions(-)


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list