Actually merge with v1.2.1 stable branch

.github/workflows/StableDistributionPipeline.yml

@@ -5,13 +5,13 @@ name: Stable Extension Distribution Pipeline
 on:
   pull_request:
     branches:
-      - v1.1.3
+      - v1.2.1
     paths-ignore:
       - '**/README.md'
       - 'doc/**'
   push:
     branches:
-      - v1.1.3
+      - v1.2.1
     paths-ignore:
       - '**/README.md'
       - 'doc/**'
@@ -24,23 +24,23 @@ concurrency:
 jobs:
   duckdb-stable-build:
     name: Build extension binaries
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.1.3
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.2.1
     with:
-      duckdb_version: v1.1.3
+      duckdb_version: v1.2.1
       extension_name: spatial
-      ci_tools_version: v1.1.3
+      ci_tools_version: v1.2.1
       vcpkg_commit: 5e5d0e1cd7785623065e77eff011afdeec1a3574
       exclude_archs: linux_amd64_musl
 
 
   duckdb-stable-deploy:
     name: Deploy extension binaries
     needs: duckdb-stable-build
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.1.3
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.2.1
     secrets: inherit
     with:
-      duckdb_version: v1.1.3
-      ci_tools_version: v1.1.3
+      duckdb_version: v1.2.1
+      ci_tools_version: v1.2.1
       extension_name: spatial
-      deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/v1.1.3' }}
+      deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/v1.2.1' }}
       exclude_archs: linux_amd64_musl

CMakeLists.txt

@@ -0 +0,0 @@
-cmake_minimum_required(VERSION 3.2)
@@ -2,3 +1,4 @@
+cmake_minimum_required(VERSION 3.5)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # Set extension name here

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2018-2024 Stichting DuckDB Foundation
+Copyright 2018-2025 Stichting DuckDB Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

Makefile

@@ -1,11 +1,9 @@
 PROJ_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
 # Configuration of extension
-EXT_NAME=excel
+EXT_NAME=spatial
 EXT_CONFIG=${PROJ_DIR}extension_config.cmake
 
-CORE_EXTENSIONS='httpfs'
-
 # Include the Makefile from extension-ci-tools
 include extension-ci-tools/makefiles/duckdb_extension.Makefile
 

deps/patches/proj.patch

@@ -0,0 +1,11 @@
+--- a/cmake/Ccache.cmake
++++ b/cmake/Ccache.cmake
+@@ -7,7 +7,7 @@
+ # Add "include(Ccache)" to CMakeLists.txt and enable
+ # using the option -D USE_CCACHE=ON
+
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.5)
+
+
+ option(USE_CCACHE

deps/patches/proj_wasm.patch

@@ -47,3 +47,14 @@
 
  # If unsuitable, append the reason to the package version so that it's
  # visible to the user.
+--- a/cmake/Ccache.cmake
++++ b/cmake/Ccache.cmake
+@@ -7,7 +7,7 @@
+ # Add "include(Ccache)" to CMakeLists.txt and enable
+ # using the option -D USE_CCACHE=ON
+
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.5)
+
+
+ option(USE_CCACHE

src/sgl/sgl.cpp

@@ -75,20 +75,22 @@ bool interpolate(const sgl::geometry *geom, double frac, vertex_xyzm *out) {
 	return false;
 }
 
-sgl::geometry interpolate_points(sgl::allocator *alloc, const sgl::geometry *geom, double frac) {
+void interpolate_points(sgl::geometry *result, sgl::allocator *alloc, const sgl::geometry *geom, double frac) {
 
 	SGL_ASSERT(geom);
 	if(geom->get_type() != sgl::geometry_type::LINESTRING) {
-		return point::make_empty(geom->has_z(), geom->has_m());
+		point::init_empty(result, geom->has_z(), geom->has_m());
+		return;
 	}
 	if(geom->is_empty()) {
-		return point::make_empty(geom->has_z(), geom->has_m());
+		point::init_empty(result, geom->has_z(), geom->has_m());
+		return;
 	}
 
 	if(geom->get_count() == 1) {
-		auto point = point::make_empty(geom->has_z(), geom->has_m());
-		point.set_vertex_data(geom->get_vertex_data(), 1);
-		return point;
+		point::init_empty(result, geom->has_z(), geom->has_m());
+		result->set_vertex_data(geom->get_vertex_data(), 1);
+		return;
 	}
 
 	// Clamp the fraction to [0, 1]
@@ -100,17 +102,20 @@ sgl::geometry interpolate_points(sgl::allocator *alloc, const sgl::geometry *geo
 
 	// Special cases
 	if(frac == 0) {
-		auto point = point::make_empty(geom->has_z(), geom->has_m());
-		point.set_vertex_data(vertex_data, 1);
+		point::init_empty(result, geom->has_z(), geom->has_m());
+		result->set_vertex_data(vertex_data, 1);
+		return;
 	}
 
 	if(frac == 1) {
-		auto point = point::make_empty(geom->has_z(), geom->has_m());
-		point.set_vertex_data(vertex_data + (vertex_count - 1) * vertex_stride, 1);
+		point::init_empty(result, geom->has_z(), geom->has_m());
+		result->set_vertex_data(vertex_data + (vertex_count - 1) * vertex_stride, 1);
+		return;
 	}
 
 
-	auto mpoint = multi_point::make_empty(geom->has_z(), geom->has_m());
+	// Make a multi-point
+	multi_point::init_empty(result, geom->has_z(), geom->has_m());
 
 	const auto actual_length = linestring::length(geom);
 	double total_length = 0.0;
@@ -151,32 +156,31 @@ sgl::geometry interpolate_points(sgl::allocator *alloc, const sgl::geometry *geo
 
 			// Set the vertex data and append it to the multi-point
 			point_ptr->set_vertex_data(data_mem, 1);
-			mpoint.append_part(point_ptr);
+			result->append_part(point_ptr);
 
 			// Update the target length
 			next_target += frac * actual_length;
 		}
 		total_length += segment_length;
 		prev = next;
 	}
-
-	return mpoint;
 }
 
-sgl::geometry substring(sgl::allocator *alloc, const sgl::geometry *geom, double beg_frac, double end_frac) {
-	auto line = linestring::make_empty(geom->has_z(), geom->has_m());
+void substring(sgl::geometry *line, sgl::allocator *alloc, const sgl::geometry *geom, double beg_frac, double end_frac) {
+	linestring::init_empty(line, geom->has_z(), geom->has_m());
+
 	if(geom->get_type() != sgl::geometry_type::LINESTRING) {
-		return line;
+		return;
 	}
 	if(geom->is_empty()) {
 		if(beg_frac == end_frac) {
-			line.set_type(geometry_type::POINT);
+			line->set_type(geometry_type::POINT);
 		}
-		return line;
+		return;
 	}
 
 	if(beg_frac > end_frac) {
-		return line;
+		return;
 	}
 
 	beg_frac = std::min(std::max(beg_frac, 0.0), 1.0);
@@ -188,24 +192,24 @@ sgl::geometry substring(sgl::allocator *alloc, const sgl::geometry *geom, double
 
 	// Reference the whole line
 	if(beg_frac == 0 && end_frac == 1) {
-		line.set_vertex_data(vertex_data, vertex_count);
-		return line;
+		line->set_vertex_data(vertex_data, vertex_count);
+		return;
 	}
 
 	if(beg_frac == end_frac) {
 		// Just interpolate once
 		vertex_xyzm point = {};
 
 		// Make it a point instead!
-		line.set_type(geometry_type::POINT);
+		line->set_type(geometry_type::POINT);
 
 		if(interpolate(geom, beg_frac, &point)) {
 			const auto mem = static_cast<char *>(alloc->alloc(vertex_size));
 			memcpy(mem, &point, vertex_size);
-			line.set_vertex_data(mem, 1);
+			line->set_vertex_data(mem, 1);
 		}
 
-		return line;
+		return;
 	}
 
 	vertex_xyzm beg = {};
@@ -281,8 +285,7 @@ sgl::geometry substring(sgl::allocator *alloc, const sgl::geometry *geom, double
 	// Copy the end point
 	memcpy(new_vertex_data + (new_vertex_count - 1) * vertex_size, &end, vertex_size);
 
-	line.set_vertex_data(new_vertex_data, new_vertex_count);
-	return line;
+	line->set_vertex_data(new_vertex_data, new_vertex_count);
 }
 
 
@@ -545,6 +548,8 @@ void force_zm(allocator &alloc, geometry *geom, bool set_z, bool set_m, double d
 			part->set_m(set_m);
 			if (!part->is_empty()) {
 				part = part->get_first_part();
+				// Continue to the next iteration in the outer loop
+				continue;
 			}
 		} break;
 		default:
@@ -1827,22 +1832,19 @@ static void handle_polygons(void *state, sgl::geometry *geom) {
 	}
 }
 
-geometry extract_points(sgl::geometry *geom) {
-	auto points = sgl::geometry(sgl::geometry_type::MULTI_POINT, geom->has_z(), geom->has_m());
-	geom->filter_parts(&points, select_points, handle_points);
-	return points;
+void extract_points(sgl::geometry *result, sgl::geometry *geom) {
+	multi_point::init_empty(result, geom->has_z(), geom->has_m());
+	geom->filter_parts(result, select_points, handle_points);
 }
 
-geometry extract_linestrings(sgl::geometry *geom) {
-	auto lines = sgl::geometry(sgl::geometry_type::MULTI_LINESTRING, geom->has_z(), geom->has_m());
-	geom->filter_parts(&lines, select_lines, handle_lines);
-	return lines;
+void extract_linestrings(sgl::geometry *result, sgl::geometry *geom) {
+	multi_linestring::init_empty(result, geom->has_z(), geom->has_m());
+	geom->filter_parts(result, select_lines, handle_lines);
 }
 
-geometry extract_polygons(sgl::geometry *geom) {
-	auto polygons = sgl::geometry(sgl::geometry_type::MULTI_POLYGON, geom->has_z(), geom->has_m());
-	geom->filter_parts(&polygons, select_polygons, handle_polygons);
-	return polygons;
+void extract_polygons(sgl::geometry *result, sgl::geometry *geom) {
+	multi_polygon::init_empty(result, geom->has_z(), geom->has_m());
+	geom->filter_parts(result, select_polygons, handle_polygons);
 }