[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0beta2-14-g97de4484e
git at osgeo.org
git at osgeo.org
Mon Jul 25 11:51:03 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 97de4484e6f0b14607ed14fd7cc6ca1fe364eaef (commit)
from 9c39b9d98819ec91ca825798356af4ef691753d4 (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 97de4484e6f0b14607ed14fd7cc6ca1fe364eaef
Author: Regina Obe <lr at pcorp.us>
Date: Mon Jul 25 14:49:26 2022 -0400
Use integer instead of int4. References #5191 for PostGIS 3.3.0
diff --git a/NEWS b/NEWS
index 505abbff1..899435b90 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ Changes since PostGIS 3.3.0beta2:
- #5157, Revise minimum_bounding_circle Cunit test
to be tolerant of small 32-bit floating point differences
(Regina Obe)
+ - #5191, Functions should use integer instead of int4 (Regina Obe)
diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in
index 3aae1137f..22e336c56 100644
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -486,13 +486,13 @@ CREATE OPERATOR CLASS hash_geometry_ops
-- ---------- ---------- ---------- ---------- ---------- ---------- ----------
-- Availability: 2.0.0
-CREATE OR REPLACE FUNCTION geometry_gist_distance_2d(internal,geometry,int4)
+CREATE OR REPLACE FUNCTION geometry_gist_distance_2d(internal,geometry,integer)
RETURNS float8
AS 'MODULE_PATHNAME' ,'gserialized_gist_distance_2d'
LANGUAGE 'c' PARALLEL SAFE;
-- Availability: 2.0.0
-CREATE OR REPLACE FUNCTION geometry_gist_consistent_2d(internal,geometry,int4)
+CREATE OR REPLACE FUNCTION geometry_gist_consistent_2d(internal,geometry,integer)
RETURNS bool
AS 'MODULE_PATHNAME' ,'gserialized_gist_consistent_2d'
LANGUAGE 'c' PARALLEL SAFE;
@@ -578,13 +578,13 @@ CREATE OR REPLACE FUNCTION _postgis_index_extent(tbl regclass, col text)
LANGUAGE 'c' STABLE STRICT;
-- Availability: 2.1.0
-CREATE OR REPLACE FUNCTION gserialized_gist_sel_2d (internal, oid, internal, int4)
+CREATE OR REPLACE FUNCTION gserialized_gist_sel_2d (internal, oid, internal, integer)
RETURNS float8
AS 'MODULE_PATHNAME', 'gserialized_gist_sel_2d'
LANGUAGE 'c' PARALLEL SAFE;
-- Availability: 2.1.0
-CREATE OR REPLACE FUNCTION gserialized_gist_sel_nd (internal, oid, internal, int4)
+CREATE OR REPLACE FUNCTION gserialized_gist_sel_nd (internal, oid, internal, integer)
RETURNS float8
AS 'MODULE_PATHNAME', 'gserialized_gist_sel_nd'
LANGUAGE 'c' PARALLEL SAFE;
@@ -843,8 +843,8 @@ CREATE OPERATOR CLASS gist_geometry_ops_2d
#if POSTGIS_PGSQL_VERSION >= 150
FUNCTION 11 geometry_gist_sortsupport_2d (internal),
#endif
- FUNCTION 8 geometry_gist_distance_2d (internal, geometry, int4),
- FUNCTION 1 geometry_gist_consistent_2d (internal, geometry, int4),
+ FUNCTION 8 geometry_gist_distance_2d (internal, geometry, integer),
+ FUNCTION 1 geometry_gist_consistent_2d (internal, geometry, integer),
FUNCTION 2 geometry_gist_union_2d (bytea, internal),
FUNCTION 3 geometry_gist_compress_2d (internal),
FUNCTION 4 geometry_gist_decompress_2d (internal),
@@ -861,7 +861,7 @@ CREATE OPERATOR CLASS gist_geometry_ops_2d
-- ---------- ---------- ---------- ---------- ---------- ---------- ----------
-- Availability: 2.0.0
-CREATE OR REPLACE FUNCTION geometry_gist_consistent_nd(internal,geometry,int4)
+CREATE OR REPLACE FUNCTION geometry_gist_consistent_nd(internal,geometry,integer)
RETURNS bool
AS 'MODULE_PATHNAME' ,'gserialized_gist_consistent'
LANGUAGE 'c' PARALLEL SAFE
@@ -1006,7 +1006,7 @@ CREATE OPERATOR |=| (
);
-- Availability: 2.2.0
-CREATE OR REPLACE FUNCTION geometry_gist_distance_nd(internal,geometry,int4)
+CREATE OR REPLACE FUNCTION geometry_gist_distance_nd(internal,geometry,integer)
RETURNS float8
AS 'MODULE_PATHNAME', 'gserialized_gist_distance'
LANGUAGE 'c' PARALLEL SAFE
@@ -1028,8 +1028,8 @@ CREATE OPERATOR CLASS gist_geometry_ops_nd
-- Availability: 2.2.0
OPERATOR 20 |=| FOR ORDER BY pg_catalog.float_ops,
-- Availability: 2.2.0
- FUNCTION 8 geometry_gist_distance_nd (internal, geometry, int4),
- FUNCTION 1 geometry_gist_consistent_nd (internal, geometry, int4),
+ FUNCTION 8 geometry_gist_distance_nd (internal, geometry, integer),
+ FUNCTION 1 geometry_gist_consistent_nd (internal, geometry, integer),
FUNCTION 2 geometry_gist_union_nd (bytea, internal),
FUNCTION 3 geometry_gist_compress_nd (internal),
FUNCTION 4 geometry_gist_decompress_nd (internal),
@@ -1230,7 +1230,7 @@ CREATE OR REPLACE FUNCTION ST_QuantizeCoordinates(g geometry, prec_x int, prec_y
-- Availability: 2.2.0
CREATE OR REPLACE FUNCTION ST_MemSize(geometry)
- RETURNS int4
+ RETURNS integer
AS 'MODULE_PATHNAME', 'LWGEOM_mem_size'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
_COST_DEFAULT;
@@ -1244,14 +1244,14 @@ CREATE OR REPLACE FUNCTION ST_Summary(geometry)
-- Availability: 1.2.2
CREATE OR REPLACE FUNCTION ST_NPoints(geometry)
- RETURNS int4
+ RETURNS integer
AS 'MODULE_PATHNAME', 'LWGEOM_npoints'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
_COST_LOW;
-- Availability: 1.2.2
CREATE OR REPLACE FUNCTION ST_NRings(geometry)
- RETURNS int4
+ RETURNS integer
AS 'MODULE_PATHNAME', 'LWGEOM_nrings'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
_COST_LOW;
@@ -1623,21 +1623,21 @@ CREATE OR REPLACE FUNCTION ST_AsEWKT(geometry)
_COST_MEDIUM;
-- Availability: 3.1.0
-CREATE OR REPLACE FUNCTION ST_AsEWKT(geometry, int4)
+CREATE OR REPLACE FUNCTION ST_AsEWKT(geometry, integer)
RETURNS TEXT
AS 'MODULE_PATHNAME','LWGEOM_asEWKT'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
_COST_MEDIUM;
-- Availability: 2.2.0
-CREATE OR REPLACE FUNCTION ST_AsTWKB(geom geometry, prec int4 default NULL, prec_z int4 default NULL, prec_m int4 default NULL, with_sizes boolean default NULL, with_boxes boolean default NULL)
+CREATE OR REPLACE FUNCTION ST_AsTWKB(geom geometry, prec integer default NULL, prec_z integer default NULL, prec_m integer default NULL, with_sizes boolean default NULL, with_boxes boolean default NULL)
RETURNS bytea
AS 'MODULE_PATHNAME','TWKBFromLWGEOM'
LANGUAGE 'c' IMMUTABLE PARALLEL SAFE
_COST_LOW;
-- Availability: 2.2.0
-CREATE OR REPLACE FUNCTION ST_AsTWKB(geom geometry[], ids bigint[], prec int4 default NULL, prec_z int4 default NULL, prec_m int4 default NULL, with_sizes boolean default NULL, with_boxes boolean default NULL)
+CREATE OR REPLACE FUNCTION ST_AsTWKB(geom geometry[], ids bigint[], prec integer default NULL, prec_z integer default NULL, prec_m integer default NULL, with_sizes boolean default NULL, with_boxes boolean default NULL)
RETURNS bytea
AS 'MODULE_PATHNAME','TWKBFromLWGEOMArray'
LANGUAGE 'c' IMMUTABLE PARALLEL SAFE
@@ -2791,7 +2791,7 @@ LANGUAGE 'plpgsql' VOLATILE STRICT;
-- FIND_SRID( <schema>, <table>, <geom col> )
-----------------------------------------------------------------------
-- Changed: 2.1.8 improve performance
-CREATE OR REPLACE FUNCTION find_srid(varchar,varchar,varchar) RETURNS int4 AS
+CREATE OR REPLACE FUNCTION find_srid(varchar,varchar,varchar) RETURNS integer AS
$$
DECLARE
schem varchar = $1;
@@ -2828,14 +2828,14 @@ CREATE OR REPLACE FUNCTION get_proj4_from_srid(integer) RETURNS text AS
LANGUAGE 'plpgsql' IMMUTABLE STRICT PARALLEL SAFE;
-- Availability: 1.2.2
-CREATE OR REPLACE FUNCTION ST_SetSRID(geom geometry, srid int4)
+CREATE OR REPLACE FUNCTION ST_SetSRID(geom geometry, srid integer)
RETURNS geometry
AS 'MODULE_PATHNAME','LWGEOM_set_srid'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
_COST_DEFAULT;
CREATE OR REPLACE FUNCTION ST_SRID(geom geometry)
- RETURNS int4
+ RETURNS integer
AS 'MODULE_PATHNAME','LWGEOM_get_srid'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
_COST_DEFAULT;
@@ -3620,14 +3620,14 @@ CREATE TYPE valid_detail AS (
);
-- Availability: 2.0.0
-CREATE OR REPLACE FUNCTION ST_IsValidDetail(geom geometry, flags int4 DEFAULT 0)
+CREATE OR REPLACE FUNCTION ST_IsValidDetail(geom geometry, flags integer DEFAULT 0)
RETURNS valid_detail
AS 'MODULE_PATHNAME', 'isvaliddetail'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
_COST_HIGH;
-- Availability: 2.0.0
-CREATE OR REPLACE FUNCTION ST_IsValidReason(geometry, int4)
+CREATE OR REPLACE FUNCTION ST_IsValidReason(geometry, integer)
RETURNS text
AS $$
SELECT CASE WHEN valid THEN 'Valid Geometry' ELSE reason END FROM (
@@ -3638,7 +3638,7 @@ CREATE OR REPLACE FUNCTION ST_IsValidReason(geometry, int4)
_COST_HIGH;
-- Availability: 2.0.0
-CREATE OR REPLACE FUNCTION ST_IsValid(geometry, int4)
+CREATE OR REPLACE FUNCTION ST_IsValid(geometry, integer)
RETURNS boolean
AS 'SELECT (@extschema at .ST_isValidDetail($1, $2)).valid'
LANGUAGE 'sql' IMMUTABLE STRICT PARALLEL SAFE
@@ -3906,7 +3906,7 @@ CREATE OR REPLACE FUNCTION ST_Node(g geometry)
-- ST_DelaunayTriangles
--------------------------------------------------------------------------------
--- ST_DelaunayTriangles(g1 geometry, tolerance float8, flags int4)
+-- ST_DelaunayTriangles(g1 geometry, tolerance float8, flags integer)
--
-- Builds Delaunay triangulation out of geometry vertices.
--
@@ -3919,7 +3919,7 @@ CREATE OR REPLACE FUNCTION ST_Node(g geometry)
--
-- Availability: 2.1.0
--
-CREATE OR REPLACE FUNCTION ST_DelaunayTriangles(g1 geometry, tolerance float8 DEFAULT 0.0, flags int4 DEFAULT 0)
+CREATE OR REPLACE FUNCTION ST_DelaunayTriangles(g1 geometry, tolerance float8 DEFAULT 0.0, flags integer DEFAULT 0)
RETURNS geometry
AS 'MODULE_PATHNAME', 'ST_DelaunayTriangles'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
@@ -4276,7 +4276,7 @@ CREATE OR REPLACE FUNCTION ST_Relate(geom1 geometry, geom2 geometry)
_COST_HIGH;
-- Availability: 2.0.0
-CREATE OR REPLACE FUNCTION ST_Relate(geom1 geometry, geom2 geometry, int4)
+CREATE OR REPLACE FUNCTION ST_Relate(geom1 geometry, geom2 geometry, integer)
RETURNS text
AS 'MODULE_PATHNAME','relate_full'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
@@ -4735,14 +4735,14 @@ CREATE OR REPLACE FUNCTION Equals(geom1 geometry, geom2 geometry)
-----------------------------------------------------------------------
-- GML & KML INPUT
-----------------------------------------------------------------------
-CREATE OR REPLACE FUNCTION _ST_GeomFromGML(text, int4)
+CREATE OR REPLACE FUNCTION _ST_GeomFromGML(text, integer)
RETURNS geometry
AS 'MODULE_PATHNAME','geom_from_gml'
LANGUAGE 'c' IMMUTABLE PARALLEL SAFE
_COST_MEDIUM;
-- Availability: 2.0.0
-CREATE OR REPLACE FUNCTION ST_GeomFromGML(text, int4)
+CREATE OR REPLACE FUNCTION ST_GeomFromGML(text, integer)
RETURNS geometry
AS 'MODULE_PATHNAME','geom_from_gml'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
@@ -4763,7 +4763,7 @@ CREATE OR REPLACE FUNCTION ST_GMLToSQL(text)
_COST_MEDIUM;
-- Availability: 2.0.0
-CREATE OR REPLACE FUNCTION ST_GMLToSQL(text, int4)
+CREATE OR REPLACE FUNCTION ST_GMLToSQL(text, integer)
RETURNS geometry
AS 'MODULE_PATHNAME','geom_from_gml'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
@@ -4838,8 +4838,8 @@ CREATE OR REPLACE FUNCTION postgis_libjson_version()
-- ENCODED POLYLINE INPUT
-----------------------------------------------------------------------
-- Availability: 2.2.0
--- ST_LineFromEncodedPolyline(polyline text, precision int4)
-CREATE OR REPLACE FUNCTION ST_LineFromEncodedPolyline(txtin text, nprecision int4 DEFAULT 5)
+-- ST_LineFromEncodedPolyline(polyline text, precision integer)
+CREATE OR REPLACE FUNCTION ST_LineFromEncodedPolyline(txtin text, nprecision integer DEFAULT 5)
RETURNS geometry
AS 'MODULE_PATHNAME','line_from_encoded_polyline'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
@@ -4851,8 +4851,8 @@ CREATE OR REPLACE FUNCTION ST_LineFromEncodedPolyline(txtin text, nprecision int
-- ENCODED POLYLINE OUTPUT
-----------------------------------------------------------------------
-- Availability: 2.2.0
--- ST_AsEncodedPolyline(geom geometry, precision int4)
-CREATE OR REPLACE FUNCTION ST_AsEncodedPolyline(geom geometry, nprecision int4 DEFAULT 5)
+-- ST_AsEncodedPolyline(geom geometry, precision integer)
+CREATE OR REPLACE FUNCTION ST_AsEncodedPolyline(geom geometry, nprecision integer DEFAULT 5)
RETURNS TEXT
AS 'MODULE_PATHNAME','LWGEOM_asEncodedPolyline'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
@@ -4865,7 +4865,7 @@ CREATE OR REPLACE FUNCTION ST_AsEncodedPolyline(geom geometry, nprecision int4 D
-----------------------------------------------------------------------
-- Availability: 1.2.2
-- Changed: 2.0.0 changed to use default args and allow calling by named args
-CREATE OR REPLACE FUNCTION ST_AsSVG(geom geometry, rel int4 DEFAULT 0, maxdecimaldigits int4 DEFAULT 15)
+CREATE OR REPLACE FUNCTION ST_AsSVG(geom geometry, rel integer DEFAULT 0, maxdecimaldigits integer DEFAULT 15)
RETURNS TEXT
AS 'MODULE_PATHNAME','LWGEOM_asSVG'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
@@ -4875,7 +4875,7 @@ CREATE OR REPLACE FUNCTION ST_AsSVG(geom geometry, rel int4 DEFAULT 0, maxdecima
-- GML OUTPUT
-----------------------------------------------------------------------
-- _ST_AsGML(version, geom, precision, option, prefix, id)
-CREATE OR REPLACE FUNCTION _ST_AsGML(int4, geometry, int4, int4, text, text)
+CREATE OR REPLACE FUNCTION _ST_AsGML(integer, geometry, integer, integer, text, text)
RETURNS TEXT
AS 'MODULE_PATHNAME','LWGEOM_asGML'
LANGUAGE 'c' IMMUTABLE PARALLEL SAFE
@@ -4889,7 +4889,7 @@ CREATE OR REPLACE FUNCTION _ST_AsGML(int4, geometry, int4, int4, text, text)
-- ST_AsGML (geom, precision, option) / version=2
-- Availability: 1.4.0
-- Changed: 2.0.0 to have default args
-CREATE OR REPLACE FUNCTION ST_AsGML(geom geometry, maxdecimaldigits int4 DEFAULT 15, options int4 DEFAULT 0)
+CREATE OR REPLACE FUNCTION ST_AsGML(geom geometry, maxdecimaldigits integer DEFAULT 15, options integer DEFAULT 0)
RETURNS TEXT
AS 'MODULE_PATHNAME','LWGEOM_asGML'
LANGUAGE 'c' IMMUTABLE PARALLEL SAFE
@@ -4902,7 +4902,7 @@ CREATE OR REPLACE FUNCTION ST_AsGML(geom geometry, maxdecimaldigits int4 DEFAULT
-- Changed: 2.0.0 to use default and named args
-- ST_AsGML(version, geom, precision, option, prefix, id)
-- Availability: 2.1.0
-CREATE OR REPLACE FUNCTION ST_AsGML(version int4, geom geometry, maxdecimaldigits int4 DEFAULT 15, options int4 DEFAULT 0, nprefix text DEFAULT null, id text DEFAULT null)
+CREATE OR REPLACE FUNCTION ST_AsGML(version integer, geom geometry, maxdecimaldigits integer DEFAULT 15, options integer DEFAULT 0, nprefix text DEFAULT null, id text DEFAULT null)
RETURNS TEXT
AS 'MODULE_PATHNAME','LWGEOM_asGML'
LANGUAGE 'c' IMMUTABLE PARALLEL SAFE
@@ -4914,8 +4914,8 @@ CREATE OR REPLACE FUNCTION ST_AsGML(version int4, geom geometry, maxdecimaldigit
-- Availability: 1.2.2
-- Changed: 2.0.0 to use default args and allow named args
--- Replaces ST_AsKML(geometry, int4) deprecated in 2.0.0
-CREATE OR REPLACE FUNCTION ST_AsKML(geom geometry, maxdecimaldigits int4 DEFAULT 15, nprefix TEXT default '')
+-- Replaces ST_AsKML(geometry, integer) deprecated in 2.0.0
+CREATE OR REPLACE FUNCTION ST_AsKML(geom geometry, maxdecimaldigits integer DEFAULT 15, nprefix TEXT default '')
RETURNS TEXT
AS 'MODULE_PATHNAME','LWGEOM_asKML'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
@@ -4929,14 +4929,14 @@ CREATE OR REPLACE FUNCTION ST_AsKML(geom geometry, maxdecimaldigits int4 DEFAULT
-- ST_AsGeoJson(geom, precision, options) / version=1
-- Changed: 2.0.0 to use default args and named args
-- Changed: 3.0.0 change default args mode
-CREATE OR REPLACE FUNCTION ST_AsGeoJson(geom geometry, maxdecimaldigits int4 DEFAULT 9, options int4 DEFAULT 8)
+CREATE OR REPLACE FUNCTION ST_AsGeoJson(geom geometry, maxdecimaldigits integer DEFAULT 9, options integer DEFAULT 8)
RETURNS text
AS 'MODULE_PATHNAME','LWGEOM_asGeoJson'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
_COST_MEDIUM;
-- Availability: 3.0.0
-CREATE OR REPLACE FUNCTION ST_AsGeoJson(r record, geom_column text DEFAULT '', maxdecimaldigits int4 DEFAULT 9, pretty_bool bool DEFAULT false)
+CREATE OR REPLACE FUNCTION ST_AsGeoJson(r record, geom_column text DEFAULT '', maxdecimaldigits integer DEFAULT 9, pretty_bool bool DEFAULT false)
RETURNS text
AS 'MODULE_PATHNAME','ST_AsGeoJsonRow'
LANGUAGE 'c' STABLE STRICT PARALLEL SAFE
@@ -4981,21 +4981,21 @@ CREATE OR REPLACE FUNCTION pgis_asmvt_transfn(internal, anyelement, text)
_COST_MEDIUM;
-- Availability: 2.4.0
-CREATE OR REPLACE FUNCTION pgis_asmvt_transfn(internal, anyelement, text, int4)
+CREATE OR REPLACE FUNCTION pgis_asmvt_transfn(internal, anyelement, text, integer)
RETURNS internal
AS 'MODULE_PATHNAME', 'pgis_asmvt_transfn'
LANGUAGE 'c' IMMUTABLE PARALLEL SAFE
_COST_MEDIUM;
-- Availability: 2.4.0
-CREATE OR REPLACE FUNCTION pgis_asmvt_transfn(internal, anyelement, text, int4, text)
+CREATE OR REPLACE FUNCTION pgis_asmvt_transfn(internal, anyelement, text, integer, text)
RETURNS internal
AS 'MODULE_PATHNAME', 'pgis_asmvt_transfn'
LANGUAGE 'c' IMMUTABLE PARALLEL SAFE
_COST_MEDIUM;
-- Availability: 3.0.0
-CREATE OR REPLACE FUNCTION pgis_asmvt_transfn(internal, anyelement, text, int4, text, text)
+CREATE OR REPLACE FUNCTION pgis_asmvt_transfn(internal, anyelement, text, integer, text, text)
RETURNS internal
AS 'MODULE_PATHNAME', 'pgis_asmvt_transfn'
LANGUAGE 'c' IMMUTABLE PARALLEL SAFE
@@ -5060,7 +5060,7 @@ CREATE AGGREGATE ST_AsMVT(anyelement, text)
-- Availability: 2.4.0
-- Changed: 3.3.0
-- Changed: 3.2.0
-CREATE AGGREGATE ST_AsMVT(anyelement, text, int4)
+CREATE AGGREGATE ST_AsMVT(anyelement, text, integer)
(
sfunc = pgis_asmvt_transfn,
stype = internal,
@@ -5075,7 +5075,7 @@ CREATE AGGREGATE ST_AsMVT(anyelement, text, int4)
-- Availability: 2.4.0
-- Changed: 3.3.0
-- Changed: 3.2.0
-CREATE AGGREGATE ST_AsMVT(anyelement, text, int4, text)
+CREATE AGGREGATE ST_AsMVT(anyelement, text, integer, text)
(
sfunc = pgis_asmvt_transfn,
stype = internal,
@@ -5090,7 +5090,7 @@ CREATE AGGREGATE ST_AsMVT(anyelement, text, int4, text)
-- Availability: 3.0.0
-- Changed: 3.3.0
-- Changed: 3.2.0
-CREATE AGGREGATE ST_AsMVT(anyelement, text, int4, text, text)
+CREATE AGGREGATE ST_AsMVT(anyelement, text, integer, text, text)
(
sfunc = pgis_asmvt_transfn,
stype = internal,
@@ -5103,7 +5103,7 @@ CREATE AGGREGATE ST_AsMVT(anyelement, text, int4, text, text)
);
-- Availability: 2.4.0
-CREATE OR REPLACE FUNCTION ST_AsMVTGeom(geom geometry, bounds box2d, extent int4 default 4096, buffer int4 default 256, clip_geom bool default true)
+CREATE OR REPLACE FUNCTION ST_AsMVTGeom(geom geometry, bounds box2d, extent integer default 4096, buffer integer default 256, clip_geom bool default true)
RETURNS geometry
AS 'MODULE_PATHNAME','ST_AsMVTGeom'
LANGUAGE 'c' IMMUTABLE PARALLEL SAFE
@@ -5248,7 +5248,7 @@ CREATE OR REPLACE FUNCTION ST_FromFlatGeobuf(anyelement, bytea)
-- Availability 1.4.0
-- Changed 2.0.0 to use default args and named args
-CREATE OR REPLACE FUNCTION ST_GeoHash(geom geometry, maxchars int4 DEFAULT 0)
+CREATE OR REPLACE FUNCTION ST_GeoHash(geom geometry, maxchars integer DEFAULT 0)
RETURNS TEXT
AS 'MODULE_PATHNAME', 'ST_GeoHash'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
@@ -5266,22 +5266,22 @@ CREATE OR REPLACE FUNCTION _ST_SortableHash(geom geometry)
-- GeoHash input
-- Availability: 2.0.?
-----------------------------------------------------------------------
--- ST_Box2dFromGeoHash(geohash text, precision int4)
-CREATE OR REPLACE FUNCTION ST_Box2dFromGeoHash(text, int4 DEFAULT NULL)
+-- ST_Box2dFromGeoHash(geohash text, precision integer)
+CREATE OR REPLACE FUNCTION ST_Box2dFromGeoHash(text, integer DEFAULT NULL)
RETURNS box2d
AS 'MODULE_PATHNAME','box2d_from_geohash'
LANGUAGE 'c' IMMUTABLE PARALLEL SAFE
_COST_LOW;
--- ST_PointFromGeoHash(geohash text, precision int4)
-CREATE OR REPLACE FUNCTION ST_PointFromGeoHash(text, int4 DEFAULT NULL)
+-- ST_PointFromGeoHash(geohash text, precision integer)
+CREATE OR REPLACE FUNCTION ST_PointFromGeoHash(text, integer DEFAULT NULL)
RETURNS geometry
AS 'MODULE_PATHNAME','point_from_geohash'
LANGUAGE 'c' IMMUTABLE PARALLEL SAFE
_COST_LOW;
--- ST_GeomFromGeoHash(geohash text, precision int4)
-CREATE OR REPLACE FUNCTION ST_GeomFromGeoHash(text, int4 DEFAULT NULL)
+-- ST_GeomFromGeoHash(geohash text, precision integer)
+CREATE OR REPLACE FUNCTION ST_GeomFromGeoHash(text, integer DEFAULT NULL)
RETURNS geometry
AS $$ SELECT CAST(@extschema at .ST_Box2dFromGeoHash($1, $2) AS geometry); $$
LANGUAGE 'sql' IMMUTABLE PARALLEL SAFE
@@ -5292,14 +5292,14 @@ CREATE OR REPLACE FUNCTION ST_GeomFromGeoHash(text, int4 DEFAULT NULL)
------------------------------------------------------------------------
-- PostGIS equivalent function: NumPoints(geometry)
CREATE OR REPLACE FUNCTION ST_NumPoints(geometry)
- RETURNS int4
+ RETURNS integer
AS 'MODULE_PATHNAME', 'LWGEOM_numpoints_linestring'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
_COST_LOW;
-- PostGIS equivalent function: NumGeometries(geometry)
CREATE OR REPLACE FUNCTION ST_NumGeometries(geometry)
- RETURNS int4
+ RETURNS integer
AS 'MODULE_PATHNAME', 'LWGEOM_numgeometries_collection'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
_COST_LOW;
@@ -5313,7 +5313,7 @@ CREATE OR REPLACE FUNCTION ST_GeometryN(geometry,integer)
-- PostGIS equivalent function: Dimension(geometry)
CREATE OR REPLACE FUNCTION ST_Dimension(geometry)
- RETURNS int4
+ RETURNS integer
AS 'MODULE_PATHNAME', 'LWGEOM_dimension'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
_COST_LOW;
@@ -5369,7 +5369,7 @@ CREATE OR REPLACE FUNCTION ST_PointN(geometry,integer)
-- Availability: 2.0.0
CREATE OR REPLACE FUNCTION ST_NumPatches(geometry)
- RETURNS int4
+ RETURNS integer
AS '
SELECT CASE WHEN @extschema at .ST_GeometryType($1) = ''ST_PolyhedralSurface''
THEN @extschema at .ST_NumGeometries($1)
@@ -5439,8 +5439,8 @@ CREATE OR REPLACE FUNCTION ST_AsText(geometry)
_COST_MEDIUM;
-- Availability: 2.5.0
--- PostGIS equivalent function: AsText(geometry, int4)
-CREATE OR REPLACE FUNCTION ST_AsText(geometry, int4)
+-- PostGIS equivalent function: AsText(geometry, integer)
+CREATE OR REPLACE FUNCTION ST_AsText(geometry, integer)
RETURNS TEXT
AS 'MODULE_PATHNAME','LWGEOM_asText'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
@@ -5454,7 +5454,7 @@ CREATE OR REPLACE FUNCTION ST_GeometryFromText(text)
_COST_MEDIUM;
-- Availability: 1.2.2
-CREATE OR REPLACE FUNCTION ST_GeometryFromText(text, int4)
+CREATE OR REPLACE FUNCTION ST_GeometryFromText(text, integer)
RETURNS geometry
AS 'MODULE_PATHNAME','LWGEOM_from_text'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
@@ -5467,8 +5467,8 @@ CREATE OR REPLACE FUNCTION ST_GeomFromText(text)
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
_COST_MEDIUM;
--- PostGIS equivalent function: ST_GeometryFromText(text, int4)
-CREATE OR REPLACE FUNCTION ST_GeomFromText(text, int4)
+-- PostGIS equivalent function: ST_GeometryFromText(text, integer)
+CREATE OR REPLACE FUNCTION ST_GeomFromText(text, integer)
RETURNS geometry
AS 'MODULE_PATHNAME','LWGEOM_from_text'
LANGUAGE 'c' IMMUTABLE STRICT PARALLEL SAFE
@@ -5493,9 +5493,9 @@ CREATE OR REPLACE FUNCTION ST_PointFromText(text)
LANGUAGE 'sql' IMMUTABLE STRICT PARALLEL SAFE
_COST_MEDIUM;
--- PostGIS equivalent function: PointFromText(text, int4)
+-- PostGIS equivalent function: PointFromText(text, integer)
-- TODO: improve this ... by not duplicating constructor time.
-CREATE OR REPLACE FUNCTION ST_PointFromText(text, int4)
+CREATE OR REPLACE FUNCTION ST_PointFromText(text, integer)
RETURNS geometry
AS '
SELECT CASE WHEN @extschema at .geometrytype(@extschema at .ST_GeomFromText($1, $2)) = ''POINT''
@@ -5516,8 +5516,8 @@ CREATE OR REPLACE FUNCTION ST_LineFromText(text)
LANGUAGE 'sql' IMMUTABLE STRICT PARALLEL SAFE
_COST_MEDIUM;
--- PostGIS equivalent function: LineFromText(text, int4)
-CREATE OR REPLACE FUNCTION ST_LineFromText(text, int4)
+-- PostGIS equivalent function: LineFromText(text, integer)
+CREATE OR REPLACE FUNCTION ST_LineFromText(text, integer)
RETURNS geometry
AS '
SELECT CASE WHEN @extschema at .geometrytype(@extschema at .ST_GeomFromText($1, $2)) = ''LINESTRING''
@@ -5538,8 +5538,8 @@ CREATE OR REPLACE FUNCTION ST_PolyFromText(text)
LANGUAGE 'sql' IMMUTABLE STRICT PARALLEL SAFE
_COST_MEDIUM;
--- PostGIS equivalent function: ST_PolygonFromText(text, int4)
-CREATE OR REPLACE FUNCTION ST_PolyFromText(text, int4)
+-- PostGIS equivalent function: ST_PolygonFromText(text, integer)
+CREATE OR REPLACE FUNCTION ST_PolyFromText(text, integer)
RETURNS geometry
AS '
SELECT CASE WHEN @extschema at .geometrytype(@extschema at .ST_GeomFromText($1, $2)) = ''POLYGON''
@@ -5550,7 +5550,7 @@ CREATE OR REPLACE FUNCTION ST_PolyFromText(text, int4)
_COST_MEDIUM;
-- Availability: 1.2.2
-CREATE OR REPLACE FUNCTION ST_PolygonFromText(text, int4)
+CREATE OR REPLACE FUNCTION ST_PolygonFromText(text, integer)
RETURNS geometry
AS 'SELECT @extschema at .ST_PolyFromText($1, $2)'
LANGUAGE 'sql' IMMUTABLE STRICT PARALLEL SAFE
@@ -5563,8 +5563,8 @@ CREATE OR REPLACE FUNCTION ST_PolygonFromText(text)
LANGUAGE 'sql' IMMUTABLE STRICT PARALLEL SAFE
_COST_MEDIUM;
--- PostGIS equivalent function: MLineFromText(text, int4)
-CREATE OR REPLACE FUNCTION ST_MLineFromText(text, int4)
+-- PostGIS equivalent function: MLineFromText(text, integer)
+CREATE OR REPLACE FUNCTION ST_MLineFromText(text, integer)
RETURNS geometry
AS '
SELECT CASE
@@ -5594,14 +5594,14 @@ CREATE OR REPLACE FUNCTION ST_MultiLineStringFromText(text)
_COST_MEDIUM;
-- Availability: 1.2.2
-CREATE OR REPLACE FUNCTION ST_MultiLineStringFromText(text, int4)
+CREATE OR REPLACE FUNCTION ST_MultiLineStringFromText(text, integer)
RETURNS geometry
AS 'SELECT @extschema at .ST_MLineFromText($1, $2)'
LANGUAGE 'sql' IMMUTABLE STRICT PARALLEL SAFE
_COST_MEDIUM;
--- PostGIS equivalent function: MPointFromText(text, int4)
-CREATE OR REPLACE FUNCTION ST_MPointFromText(text, int4)
+-- PostGIS equivalent function: MPointFromText(text, integer)
+CREATE OR REPLACE FUNCTION ST_MPointFromText(text, integer)
RETURNS geometry
AS '
SELECT CASE WHEN @extschema at .geometrytype(@extschema at .ST_GeomFromText($1, $2)) = ''MULTIPOINT''
@@ -5629,8 +5629,8 @@ CREATE OR REPLACE FUNCTION ST_MultiPointFromText(text)
LANGUAGE 'sql' IMMUTABLE STRICT PARALLEL SAFE
_COST_MEDIUM;
--- PostGIS equivalent function: MPolyFromText(text, int4)
-CREATE OR REPLACE FUNCTION ST_MPolyFromText(text, int4)
+-- PostGIS equivalent function: MPolyFromText(text, integer)
+CREATE OR REPLACE FUNCTION ST_MPolyFromText(text, integer)
RETURNS geometry
AS '
SELECT CASE WHEN @extschema at .geometrytype(@extschema at .ST_GeomFromText($1, $2)) = ''MULTIPOLYGON''
@@ -5652,7 +5652,7 @@ CREATE OR REPLACE FUNCTION ST_MPolyFromText(text)
_COST_MEDIUM;
-- Availability: 1.2.2
-CREATE OR REPLACE FUNCTION ST_MultiPolygonFromText(text, int4)
+CREATE OR REPLACE FUNCTION ST_MultiPolygonFromText(text, integer)
RETURNS geometry
AS 'SELECT @extschema at .ST_MPolyFromText($1, $2)'
LANGUAGE 'sql' IMMUTABLE STRICT PARALLEL SAFE
@@ -5666,7 +5666,7 @@ CREATE OR REPLACE FUNCTION ST_MultiPolygonFromText(text)
_COST_MEDIUM;
-- Availability: 1.2.2
-CREATE OR REPLACE FUNCTION ST_GeomCollFromText(text, int4)
+CREATE OR REPLACE FUNCTION ST_GeomCollFromText(text, integer)
RETURNS geometry
AS '
SELECT CASE
@@ -6817,7 +6817,7 @@ LANGUAGE 'plpgsql' IMMUTABLE STRICT PARALLEL SAFE _COST_HIGH;
-- X3D OUTPUT
-----------------------------------------------------------------------
-- _ST_AsX3D(version, geom, precision, option, attribs)
-CREATE OR REPLACE FUNCTION _ST_AsX3D(int4, geometry, int4, int4, text)
+CREATE OR REPLACE FUNCTION _ST_AsX3D(integer, geometry, integer, integer, text)
RETURNS TEXT
AS 'MODULE_PATHNAME','LWGEOM_asX3D'
LANGUAGE 'c' IMMUTABLE PARALLEL SAFE
-----------------------------------------------------------------------
Summary of changes:
NEWS | 1 +
postgis/postgis.sql.in | 160 ++++++++++++++++++++++++-------------------------
2 files changed, 81 insertions(+), 80 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list