[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-692-g3af56023f

[git at osgeo.org]

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  3af56023fd1c70168e555364562d7c950ec8e34b (commit)
      from  c9c75d1b54eede92bc8437a11b2ce56531988c52 (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 3af56023fd1c70168e555364562d7c950ec8e34b
Author: Regina Obe <lr at pcorp.us>
Date:   Mon Apr 4 22:43:48 2022 -0400

    Fix compile against PG15. References #5123 for PostGIS 3.3

diff --git a/NEWS b/NEWS
index bf49a58cb..64fdb4664 100644
--- a/NEWS
+++ b/NEWS
@@ -20,16 +20,19 @@ PostGIS 3.3.0dev
   - GH657, GiST: do not call no-op decompress function (Aliaksandr Kalenik)
   - #4912, GiST: fix crash on STORAGE EXTERNAL for geography (Aliaksandr Kalenik)
   - ST_ConcaveHull GEOS 3.11+ native implementation (Paul Ramsey, Martin Davis)
-  - #5100, Support for PostgreSQL 15 (atoi removal) (Laurenz Albe)
   - GH678, Enable Link-Time Optimizations by default if supported (Sergei Shoulbakov)
 
- * New features*
+ * New features *
   - ST_Letters creates geometries that look like letters (Paul Ramsey)
   - #5037, postgis_sfcgal: ST_3DConvexHull (Loïc Bartoletti)
   - postgis_sfcgal: sfcgal_full_version - reports BOOST and CGAL version
     (Loïc Bartoletti)
   - GH659, MARC21/XML, ST_GeomFromMARC21, ST_AsMARC21 (Jim Jones)
 
+ * Bug Fix *
+   - #5100, Support for PostgreSQL 15 (atoi removal) (Laurenz Albe)
+   - #5123, PG15 now exposes json types and functions, no need
+    to include for PG15+ (Regina Obe)
 
 
 PostGIS 3.2.0 (Olivier Courtin Edition)
diff --git a/postgis/lwgeom_out_geojson.c b/postgis/lwgeom_out_geojson.c
index fcedef70f..f61a5609a 100644
--- a/postgis/lwgeom_out_geojson.c
+++ b/postgis/lwgeom_out_geojson.c
@@ -32,7 +32,7 @@
 #include "lwgeom_log.h"
 #include "liblwgeom.h"
 
-
+#if POSTGIS_PGSQL_VERSION < 150
 typedef enum					/* type categories for datum_to_json */
 {
 	JSONTYPE_NULL,				/* null, so we didn't bother to identify */
@@ -47,6 +47,7 @@ typedef enum					/* type categories for datum_to_json */
 	JSONTYPE_CAST,				/* something with an explicit cast to JSON */
 	JSONTYPE_OTHER				/* all else */
 } JsonTypeCategory;
+#endif
 
 static void array_dim_to_json(StringInfo result, int dim, int ndims, int *dims,
 				  Datum *vals, bool *nulls, int *valcount,
@@ -67,9 +68,11 @@ static void composite_to_json(Datum composite, StringInfo result,
 static void datum_to_json(Datum val, bool is_null, StringInfo result,
 						  JsonTypeCategory tcategory, Oid outfuncoid,
 						  bool key_scalar);
+#if POSTGIS_PGSQL_VERSION < 150
 static void json_categorize_type(Oid typoid,
 								 JsonTypeCategory *tcategory,
 								 Oid *outfuncoid);
+#endif
 static char * postgis_JsonEncodeDateTime(char *buf, Datum value, Oid typid);
 static int postgis_time2tm(TimeADT time, struct pg_tm *tm, fsec_t *fsec);
 static int postgis_timetz2tm(TimeTzADT *time, struct pg_tm *tm, fsec_t *fsec, int *tzp);
@@ -231,6 +234,7 @@ composite_to_geojson(FunctionCallInfo fcinfo,
  * json.c from the Postgres source tree as of 2019-03-28.
  * It would be far better if these were exported from the
  * backend so we could just use them here. Maybe someday.
+ * Sequel: 2022-04-04 That some day finally came in PG15
  */
 
 /*
@@ -240,6 +244,7 @@ composite_to_geojson(FunctionCallInfo fcinfo,
  * output function OID.  If the returned category is JSONTYPE_CAST, we
  * return the OID of the type->JSON cast function instead.
  */
+#if POSTGIS_PGSQL_VERSION < 150
 static void
 json_categorize_type(Oid typoid,
 					 JsonTypeCategory *tcategory,
@@ -731,3 +736,4 @@ postgis_JsonEncodeDateTime(char *buf, Datum value, Oid typid)
 
 	return buf;
 }
+#endif

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

Summary of changes:
 NEWS                         | 7 +++++--
 postgis/lwgeom_out_geojson.c | 8 +++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
PostGIS