Update to DuckDB v1.5-variegata branch, port forward v1.4-andium changes

.github/workflows/MainDistributionPipeline.yml

@@ -5,13 +5,13 @@ name: Main Extension Distribution Pipeline
 on:
   pull_request:
     branches:
-      - main
+      - v1.5-variegata
     paths-ignore:
       - '**/README.md'
       - 'doc/**'
   push:
     branches:
-      - main
+      - v1.5-variegata
     paths-ignore:
       - '**/README.md'
       - 'doc/**'
@@ -27,18 +27,20 @@ jobs:
     name: Build extension binaries
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
-      duckdb_version: main
-      extension_name: spatial
+      duckdb_version: v1.5-variegata
       ci_tools_version: main
-      vcpkg_commit: ce613c41372b23b1f51333815feb3edd87ef8a8b
+      extension_name: spatial
+      vcpkg_commit: 84bab45d415d22042bd0b9081aea57f362da3f35
+      exclude_archs: 'linux_amd64_musl'
 
   duckdb-latest-deploy:
     name: Deploy extension binaries
     needs: duckdb-latest-build
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
     secrets: inherit
     with:
-      duckdb_version: main
+      duckdb_version: v1.5-variegata
       ci_tools_version: main
       extension_name: spatial
       deploy_latest: ${{ startsWith(github.ref, 'refs/heads/v') || github.ref == 'refs/heads/main' }}
+      exclude_archs: 'linux_amd64_musl'

extension_config.cmake

@@ -14,3 +14,5 @@ duckdb_extension_load(spatial
         INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/src/spatial
         ${DO_TESTS}
 )
+
+duckdb_extension_load(json)

src/spatial/index/rtree/rtree_index_plan_scan.cpp

@@ -1,3 +1,12 @@
+#include "spatial/geometry/bbox.hpp"
+#include "spatial/index/rtree/rtree_index.hpp"
+#include "spatial/index/rtree/rtree_index_create_logical.hpp"
+#include "spatial/index/rtree/rtree_index_scan.hpp"
+#include "spatial/index/rtree/rtree_module.hpp"
+#include "spatial/spatial_types.hpp"
+#include "spatial/geometry/geometry_serialization.hpp"
+#include "spatial/util/math.hpp"
+
 #include "duckdb/catalog/catalog_entry/duck_table_entry.hpp"
 #include "duckdb/function/table/table_scan.hpp"
 #include "duckdb/optimizer/column_binding_replacer.hpp"
@@ -18,14 +27,6 @@
 #include "duckdb/planner/filter/expression_filter.hpp"
 #include "duckdb/main/database.hpp"
 
-#include "spatial/geometry/bbox.hpp"
-#include "spatial/index/rtree/rtree_index.hpp"
-#include "spatial/index/rtree/rtree_index_create_logical.hpp"
-#include "spatial/index/rtree/rtree_index_scan.hpp"
-#include "spatial/index/rtree/rtree_module.hpp"
-#include "spatial/spatial_types.hpp"
-#include "spatial/geometry/geometry_serialization.hpp"
-#include "spatial/util/math.hpp"
 
 namespace duckdb {
 //-----------------------------------------------------------------------------
@@ -313,7 +314,9 @@ class RTreeIndexScanOptimizer : public OptimizerExtension {
 void RTreeModule::RegisterIndexPlanScan(ExtensionLoader &loader) {
 	// Register the optimizer extension
 	auto &db = loader.GetDatabaseInstance();
-	db.config.optimizer_extensions.push_back(RTreeIndexScanOptimizer());
+	RTreeIndexScanOptimizer optimizer;
+
+	OptimizerExtension::Register(db.config, optimizer);
 }
 
 } // namespace duckdb

src/spatial/modules/gdal/gdal_module.cpp

@@ -27,6 +27,7 @@
 #include "cpl_vsi.h"
 #include "cpl_vsi_error.h"
 #include "cpl_vsi_virtual.h"
+#include "duckdb/main/settings.hpp"
 
 namespace duckdb {
 namespace {
@@ -209,7 +210,7 @@ class DuckDBFileSystemHandler final : public VSIFilesystemHandler {
 			}
 
 			// Fall back to GDAL instead (if external access is enabled)
-			if (!context.db->config.options.enable_external_access) {
+			if (!Settings::Get<EnableExternalAccessSetting>(context)) {
 				if (set_error) {
 					VSIError(VSIE_FileError, "%s", error_data.RawMessage().c_str());
 				}
@@ -410,7 +411,7 @@ class DuckDBFileSystemPrefix final : public ClientContextState {
 	string AddPrefix(const string &value) const {
 		// If the user explicitly asked for a VSI prefix, we don't add our own
 		if (StringUtil::StartsWith(value, "/vsi")) {
-			if (!context.db->config.options.enable_external_access) {
+			if (!Settings::Get<EnableExternalAccessSetting>(context)) {
 				throw PermissionException("Cannot open file '%s' with VSI prefix: External access is disabled", value);
 			}
 			return value;
@@ -1023,7 +1024,7 @@ static constexpr auto DOCUMENTATION = R"(
 	    | `allowed_drivers` | VARCHAR[] | A list of GDAL driver names that are allowed to be used to open the file. If empty, all drivers are allowed. |
 	    | `sibling_files` | VARCHAR[] | A list of sibling files that are required to open the file. E.g., the ESRI Shapefile driver requires a .shx file to be present. Although most of the time these can be discovered automatically. |
 	    | `spatial_filter_box` | BOX_2D | If set to a BOX_2D, the table function will only return rows that intersect with the given bounding box. Similar to spatial_filter. |
-	    | `keep_wkb` | BOOLEAN | If set, the table function will return geometries in a wkb_geometry column with the type WKB_BLOB (which can be cast to BLOB) instead of GEOMETRY. This is useful if you want to use DuckDB with more exotic geometry subtypes that DuckDB spatial doesnt support representing in the GEOMETRY type yet. |
+	    | `keep_wkb` | BOOLEAN | If set, the table function will return geometries in a wkb_geometry column with the type WKB_BLOB (which can be cast to BLOB) instead of GEOMETRY. This is useful if you want to use DuckDB with more exotic geometry subtypes that DuckDB spatial doesn't support representing in the GEOMETRY type yet. |
 
 	    Note that GDAL is single-threaded, so this table function will not be able to make full use of parallelism.
 
@@ -1778,7 +1779,7 @@ void RegisterGDALModule(ExtensionLoader &loader) {
 
 		// Set GDAL error handler
 		CPLSetErrorHandler([](CPLErr e, int code, const char *raw_msg) {
-			// DuckDB doesnt do warnings, so we only throw on errors
+			// DuckDB doesn't do warnings, so we only throw on errors
 			if (e != CE_Failure && e != CE_Fatal) {
 				return;
 			}