[SCM] PostGIS branch master updated. 3.6.0rc2-401-ga197e6b1f

[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  a197e6b1f2bc7ff75fb1d34b806d4a80a4060d77 (commit)
      from  c4426d4baaaed9a3e8ba6fbab2a05ba962dccdea (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 a197e6b1f2bc7ff75fb1d34b806d4a80a4060d77
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Mar 20 14:54:06 2026 -0700

    Use Pg composite_to_json() function in 19+ (Paul Ramsey)
    References #6058

diff --git a/postgis/lwgeom_out_geojson.c b/postgis/lwgeom_out_geojson.c
index 5e0a6f589..293d68ef0 100644
--- a/postgis/lwgeom_out_geojson.c
+++ b/postgis/lwgeom_out_geojson.c
@@ -69,8 +69,12 @@ static void composite_to_geojson(FunctionCallInfo fcinfo,
 				 bool use_line_feeds,
 				 Oid geom_oid,
 				 Oid geog_oid);
+
+#if POSTGIS_PGSQL_VERSION < 190
 static void composite_to_json(Datum composite, StringInfo result,
 							  bool use_line_feeds);
+#endif
+
 static void datum_to_json(Datum val, bool is_null, StringInfo result,
 						  JsonTypeCategory tcategory, Oid outfuncoid,
 						  bool key_scalar);
@@ -570,6 +574,7 @@ array_to_json_internal(Datum array, StringInfo result, bool use_line_feeds)
 /*
  * Turn a composite / record into JSON.
  */
+#if POSTGIS_PGSQL_VERSION < 190
 static void
 composite_to_json(Datum composite, StringInfo result, bool use_line_feeds)
 {
@@ -635,6 +640,7 @@ composite_to_json(Datum composite, StringInfo result, bool use_line_feeds)
 	appendStringInfoChar(result, '}');
 	ReleaseTupleDesc(tupdesc);
 }
+#endif
 
 /*
  * Process a single dimension of an array.

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

Summary of changes:
 postgis/lwgeom_out_geojson.c | 6 ++++++
 1 file changed, 6 insertions(+)


hooks/post-receive
-- 
PostGIS