[SCM] PostGIS branch stable-3.3 updated. 3.3.10-85-gdd5f18e59

[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, stable-3.3 has been updated
       via  dd5f18e59eb69953a625ebce5c13889856df2540 (commit)
       via  6a37ecd9adcad85bcf84f3ed15a510c6ad3f5487 (commit)
      from  e8ac394a16b235bbf350c015b74d51562c08b8b4 (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 dd5f18e59eb69953a625ebce5c13889856df2540
Merge: e8ac394a1 6a37ecd9a
Author: Darafei Praliaskouski <komzpa at gmail.com>
Date:   Thu Jul 23 13:00:45 2026 -0700

    Merge pull request 'Fix PostgreSQL 19 GeoJSON output builds on stable 3.3' (!494) from Komzpa/postgis:pr/stable33-pg19-geojson into stable-3.3
    
    Reviewed-on: https://gitea.osgeo.org/postgis/postgis/pulls/494


commit 6a37ecd9adcad85bcf84f3ed15a510c6ad3f5487
Author: Regina Obe <lr at pcorp.us>
Date:   Thu Jul 3 12:20:34 2025 -0400

    Get rid of pg version conditional for geojson so works on PG 19
    
    (cherry picked from commit 02839b684ecd8d555fce6ff21fa7f30533e614d4)

diff --git a/.woodpecker/regress.yml b/.woodpecker/regress.yml
index 8b4883ec5..71536cf63 100644
--- a/.woodpecker/regress.yml
+++ b/.woodpecker/regress.yml
@@ -100,7 +100,7 @@ steps:
 
   upgradecheck-pg11:
     image: *test-image
-    depends_on: build-pg11
+    depends_on: installcheck-pg11
     environment:
       PGVER: 11
     commands:
@@ -111,7 +111,7 @@ steps:
 
   upgradecheck-pg15:
     image: *test-image
-    depends_on: build-pg15
+    depends_on: installcheck-pg15
     environment:
       PGVER: 15
     commands:
diff --git a/NEWS b/NEWS
index faa044b1d..dedcfa402 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ PostGIS 3.3.11
    GDAL compatibility (Darafei Praliaskouski)
  - GH-895, Qualify pg_class lookup during SRID/PROJ validation
    (Darafei Praliaskouski)
+ - Fix PostgreSQL 19 GeoJSON output builds (Regina Obe)
  - GH-897, [topology] Harden topology helper functions and
    maintenance SQL against identifier, tolerance, bigint, and cleanup
    regressions (Darafei Praliaskouski)
diff --git a/postgis/lwgeom_out_geojson.c b/postgis/lwgeom_out_geojson.c
index 31b097fd7..1e84ccaca 100644
--- a/postgis/lwgeom_out_geojson.c
+++ b/postgis/lwgeom_out_geojson.c
@@ -32,22 +32,20 @@
 #include "lwgeom_log.h"
 #include "liblwgeom.h"
 
-#if POSTGIS_PGSQL_VERSION < 180
-typedef enum					/* type categories for datum_to_json */
+typedef enum /* type categories for datum_to_json */
 {
-	JSONTYPE_NULL,				/* null, so we didn't bother to identify */
-	JSONTYPE_BOOL,				/* boolean (built-in types only) */
-	JSONTYPE_NUMERIC,			/* numeric (ditto) */
-	JSONTYPE_DATE,				/* we use special formatting for datetimes */
+	JSONTYPE_NULL,    /* null, so we didn't bother to identify */
+	JSONTYPE_BOOL,    /* boolean (built-in types only) */
+	JSONTYPE_NUMERIC, /* numeric (ditto) */
+	JSONTYPE_DATE,    /* we use special formatting for datetimes */
 	JSONTYPE_TIMESTAMP,
 	JSONTYPE_TIMESTAMPTZ,
-	JSONTYPE_JSON,				/* JSON itself (and JSONB) */
-	JSONTYPE_ARRAY,				/* array */
-	JSONTYPE_COMPOSITE,			/* composite */
-	JSONTYPE_CAST,				/* something with an explicit cast to JSON */
-	JSONTYPE_OTHER				/* all else */
+	JSONTYPE_JSON,      /* JSON itself (and JSONB) */
+	JSONTYPE_ARRAY,     /* array */
+	JSONTYPE_COMPOSITE, /* composite */
+	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,
@@ -65,14 +63,12 @@ static void composite_to_geojson(FunctionCallInfo fcinfo,
 				 Oid geog_oid);
 static void composite_to_json(Datum composite, StringInfo result,
 							  bool use_line_feeds);
-static void datum_to_json(Datum val, bool is_null, StringInfo result,
-						  JsonTypeCategory tcategory, Oid outfuncoid,
-						  bool key_scalar);
-#if POSTGIS_PGSQL_VERSION < 180
+static void
+datum_to_json(Datum val, bool is_null, StringInfo result, JsonTypeCategory tcategory, Oid outfuncoid, bool key_scalar);
 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);
@@ -244,7 +240,6 @@ 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 < 180
 static void
 json_categorize_type(Oid typoid,
 					 JsonTypeCategory *tcategory,
@@ -337,7 +332,6 @@ json_categorize_type(Oid typoid,
 			break;
 	}
 }
-#endif
 /*
  * Turn a Datum into JSON text, appending the string to "result".
  *

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

Summary of changes:
 .woodpecker/regress.yml      |  4 ++--
 NEWS                         |  1 +
 postgis/lwgeom_out_geojson.c | 32 +++++++++++++-------------------
 3 files changed, 16 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
PostGIS