Return subclassed FunctionData with std::move, update makefile workflow to hopefully pass extension distribution CI on windows

.github/workflows/Linux.yml

@@ -1,5 +1,5 @@
 name: Linux
-on: 
+on:
   push:
     paths-ignore:
       - '**/README.md'

.github/workflows/MacOS.yml

@@ -1,5 +1,5 @@
 name: MacOS
-on: 
+on:
   push:
     paths-ignore:
       - '**/README.md'

.github/workflows/MainDistributionPipeline.yml

@@ -4,6 +4,8 @@
 name: Main Extension Distribution Pipeline
 on:
   push:
+    paths-ignore:
+      - '**/README.md'
     branches:
       - main
   workflow_dispatch:

.github/workflows/Windows.yml

@@ -1,5 +1,5 @@
 name: Windows
-on: 
+on:
   push:
     paths-ignore:
       - '**/README.md'

Makefile

@@ -5,38 +5,62 @@ all: release
 MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
 PROJ_DIR := $(dir $(MKFILE_PATH))
 
-ifneq (${OSX_BUILD_ARCH}, )
-    CMAKE_VARS:=${CMAKE_VARS} -DOSX_BUILD_ARCH=${OSX_BUILD_ARCH}
+ifeq ($(OS),Windows_NT)
+	TEST_PATH="/test/Release/unittest.exe"
+else
+	TEST_PATH="/test/unittest"
 endif
 
-ifeq (${STATIC_LIBCPP}, 1)
-	STATIC_LIBCPP=-DSTATIC_LIBCPP=TRUE
+#### OSX config
+OSX_BUILD_FLAG=
+ifneq (${OSX_BUILD_ARCH}, "")
+	OSX_BUILD_FLAG=-DOSX_BUILD_ARCH=${OSX_BUILD_ARCH}
 endif
 
-ifeq ($(GEN),ninja)
-	GENERATOR=-G "Ninja"
-	FORCE_COLOR=-DFORCE_COLORED_OUTPUT=1
-endif
-
-# Enable VCPKG for this build
+#### VCPKG config
+VCPKG_TOOLCHAIN_PATH?=
 ifneq ("${VCPKG_TOOLCHAIN_PATH}", "")
-	CMAKE_VARS:=${CMAKE_VARS} -DCMAKE_TOOLCHAIN_FILE='${VCPKG_TOOLCHAIN_PATH}' -DVCPKG_BUILD=1
+	TOOLCHAIN_FLAGS:=${TOOLCHAIN_FLAGS} -DVCPKG_MANIFEST_DIR='${PROJ_DIR}' -DVCPKG_BUILD=1 -DCMAKE_TOOLCHAIN_FILE='${VCPKG_TOOLCHAIN_PATH}'
 endif
 ifneq ("${VCPKG_TARGET_TRIPLET}", "")
-	CMAKE_VARS:=${CMAKE_VARS} -DVCPKG_TARGET_TRIPLET='${VCPKG_TARGET_TRIPLET}'
+	TOOLCHAIN_FLAGS:=${TOOLCHAIN_FLAGS} -DVCPKG_TARGET_TRIPLET='${VCPKG_TARGET_TRIPLET}'
 endif
 ifeq (${USE_MERGED_VCPKG_MANIFEST}, 1)
-	CMAKE_VARS:=${CMAKE_VARS} -DVCPKG_MANIFEST_DIR='${PROJ_DIR}build/extension_configuration'
+	TOOLCHAIN_FLAGS:=${TOOLCHAIN_FLAGS} -DVCPKG_MANIFEST_DIR='${PROJ_DIR}build/extension_configuration'
 else
-	CMAKE_VARS:=${CMAKE_VARS} -DVCPKG_MANIFEST_DIR='${PROJ_DIR}'
+	TOOLCHAIN_FLAGS:=${TOOLCHAIN_FLAGS} -DVCPKG_MANIFEST_DIR='${PROJ_DIR}'
+endif
+
+#### Enable Ninja as generator
+ifeq ($(GEN),ninja)
+	GENERATOR=-G "Ninja" -DFORCE_COLORED_OUTPUT=1
 endif
 
-BUILD_FLAGS=-DEXTENSION_STATIC_BUILD=1 ${OSX_BUILD_UNIVERSAL_FLAG} ${STATIC_LIBCPP} ${CMAKE_VARS}
+
+#### Configuration for this extension
+EXTENSION_NAME=SPATIAL
+EXTENSION_FLAGS=\
+-DENABLE_SANITIZER=OFF \
+-DDUCKDB_EXTENSION_NAMES="spatial" \
+-DDUCKDB_EXTENSION_${EXTENSION_NAME}_PATH="$(PROJ_DIR)" \
+-DDUCKDB_EXTENSION_${EXTENSION_NAME}_SHOULD_LINK=1 \
+-DDUCKDB_EXTENSION_${EXTENSION_NAME}_LOAD_TESTS=1 \
+-DDUCKDB_EXTENSION_${EXTENSION_NAME}_INCLUDE_PATH="$(PROJ_DIR)spatial/include" \
+-DDUCKDB_EXTENSION_${EXTENSION_NAME}_TEST_PATH="$(PROJ_DIR)test"
+
+#### Add more of the DuckDB in-tree extensions here that you need (also feel free to remove them when not needed)
+EXTRA_EXTENSIONS_FLAG=-DBUILD_EXTENSIONS="parquet"
+
+BUILD_FLAGS=-DEXTENSION_STATIC_BUILD=1 $(EXTENSION_FLAGS) ${EXTRA_EXTENSIONS_FLAG} $(OSX_BUILD_FLAG) $(TOOLCHAIN_FLAGS)
 ifeq (${BUILD_SHELL}, 0)
 	BUILD_FLAGS += -DBUILD_SHELL=0
 endif
+CLIENT_FLAGS:=
+
+#### Main build
+# For regular CLI build, we link the spatial extension directly into the DuckDB executable
+CLIENT_FLAGS=-DDUCKDB_EXTENSION_${EXTENSION_NAME}_SHOULD_LINK=1
 
-CLIENT_FLAGS :=
 
 # These flags will make DuckDB build the extension
 EXTENSION_FLAGS=\
@@ -48,76 +72,73 @@ EXTENSION_FLAGS=\
 -DDUCKDB_EXTENSION_SPATIAL_TEST_PATH="$(PROJ_DIR)test" \
 -DDUCKDB_EXTENSION_SPATIAL_INCLUDE_PATH="$(PROJ_DIR)spatial/include" \
 
-pull:
-	git submodule init
-	git submodule update --recursive --remote
-
-clean:
-	rm -rf build
-	rm -rf testext
-	cd duckdb && make clean
-
-# Main build
 debug:
 	mkdir -p  build/debug && \
-	cmake $(GENERATOR) $(FORCE_COLOR) $(EXTENSION_FLAGS) ${CLIENT_FLAGS} -DEXTENSION_STATIC_BUILD=1 -DCMAKE_BUILD_TYPE=Debug ${BUILD_FLAGS} -S ./duckdb/ -B build/debug && \
+	cmake $(GENERATOR) $(BUILD_FLAGS) $(CLIENT_FLAGS) -DCMAKE_BUILD_TYPE=Debug -S ./duckdb/ -B build/debug && \
 	cmake --build build/debug --config Debug
 
 release:
 	mkdir -p build/release && \
-	cmake $(GENERATOR) $(FORCE_COLOR) $(EXTENSION_FLAGS) ${CLIENT_FLAGS} -DEXTENSION_STATIC_BUILD=1 -DCMAKE_BUILD_TYPE=Release ${BUILD_FLAGS} -S ./duckdb/ -B build/release && \
+	cmake $(GENERATOR) $(BUILD_FLAGS)  $(CLIENT_FLAGS)  -DCMAKE_BUILD_TYPE=Release -S ./duckdb/ -B build/release && \
 	cmake --build build/release --config Release
 
-# Client build
-debug_js: CLIENT_FLAGS=-DBUILD_NODE=1 -DBUILD_JSON_EXTENSION=1
-debug_js: debug
-
-debug_r: CLIENT_FLAGS=-DBUILD_R=1
-debug_r: debug
+##### Client build
+JS_BUILD_FLAGS=-DBUILD_NODE=1 -DDUCKDB_EXTENSION_${EXTENSION_NAME}_SHOULD_LINK=0
+PY_BUILD_FLAGS=-DBUILD_PYTHON=1 -DDUCKDB_EXTENSION_${EXTENSION_NAME}_SHOULD_LINK=0
 
-debug_python: CLIENT_FLAGS=-DBUILD_PYTHON=1 -DBUILD_JSON_EXTENSION=1 -DBUILD_FTS_EXTENSION=1 -DBUILD_TPCH_EXTENSION=1 -DBUILD_VISUALIZER_EXTENSION=1 -DBUILD_TPCDS_EXTENSION=1
+debug_js: CLIENT_FLAGS=$(JS_BUILD_FLAGS)
+debug_js: debug
+debug_python: CLIENT_FLAGS=$(PY_BUILD_FLAGS)
 debug_python: debug
-
-release_js: CLIENT_FLAGS=-DBUILD_NODE=1 -DBUILD_JSON_EXTENSION=1
+release_js: CLIENT_FLAGS=$(JS_BUILD_FLAGS)
 release_js: release
-
-release_r: CLIENT_FLAGS=-DBUILD_R=1
-release_r: release
-
-release_python: CLIENT_FLAGS=-DBUILD_PYTHON=1 -DBUILD_JSON_EXTENSION=1 -DBUILD_FTS_EXTENSION=1 -DBUILD_TPCH_EXTENSION=1 -DBUILD_VISUALIZER_EXTENSION=1 -DBUILD_TPCDS_EXTENSION=1
+release_python: CLIENT_FLAGS=$(PY_BUILD_FLAGS)
 release_python: release
 
 # Main tests
 test: test_release
 
 test_release: release
-	./build/release/test/unittest "$(PROJ_DIR)test/*"
+	./build/release/$(TEST_PATH) "$(PROJ_DIR)test/*"
 
 test_debug: debug
-	./build/debug/test/unittest "$(PROJ_DIR)test/*"
+	./build/debug/$(TEST_PATH) "$(PROJ_DIR)test/*"
 
-test_debug_lldb: debug
-	lldb ./build/debug/test/unittest "$(PROJ_DIR)test/*"
+#### Client tests
+DEBUG_EXT_PATH='$(PROJ_DIR)build/debug/extension/spatial/spatial.duckdb_extension'
+RELEASE_EXT_PATH='$(PROJ_DIR)build/release/extension/spatial/spatial.duckdb_extension'
 
-# Client tests
 test_js: test_debug_js
+
 test_debug_js: debug_js
-	cd duckdb/tools/nodejs && npm run test-path -- "../../../test/nodejs/**/*.js"
+	cd duckdb/tools/nodejs && ${EXTENSION_NAME}_EXTENSION_BINARY_PATH=$(DEBUG_EXT_PATH) npm run test-path -- "../../../test/nodejs/**/*.js"
 
 test_release_js: release_js
-	cd duckdb/tools/nodejs && npm run test-path -- "../../../test/nodejs/**/*.js"
+	cd duckdb/tools/nodejs && ${EXTENSION_NAME}_EXTENSION_BINARY_PATH=$(RELEASE_EXT_PATH) npm run test-path -- "../../../test/nodejs/**/*.js"
 
 test_python: test_debug_python
+
 test_debug_python: debug_python
-	cd test/python && python3 -m pytest
+	cd test/python && ${EXTENSION_NAME}_EXTENSION_BINARY_PATH=$(DEBUG_EXT_PATH) python3 -m pytest
 
 test_release_python: release_python
-	cd test/python && python3 -m pytest
+	cd test/python && ${EXTENSION_NAME}_EXTENSION_BINARY_PATH=$(RELEASE_EXT_PATH) python3 -m pytest
 
+#### Misc
 format:
 	find spatial/src/ -iname *.hpp -o -iname *.cpp | xargs clang-format --sort-includes=0 -style=file -i
 	find spatial/include -iname *.hpp -o -iname *.cpp | xargs clang-format --sort-includes=0 -style=file -i
 	cmake-format -i spatial/src/CMakeLists.txt
 
 update:
-	git submodule update --remote --merge
+	git submodule update --remote --merge
+
+pull:
+	git submodule init
+	git submodule update --recursive --remote
+
+clean:
+	rm -rf build
+	rm -rf testext
+#cd duckdb && make clean
+#cd duckdb && make clean-python

spatial/src/spatial/core/functions/table/st_read_osm.cpp

@@ -91,7 +91,7 @@ static unique_ptr<FunctionData> Bind(ClientContext &context, TableFunctionBindIn
 
 	auto file_name = StringValue::Get(input.inputs[0]);
 	auto result = make_uniq<BindData>(file_name);
-	return result;
+	return std::move(result);
 }
 
 enum class FileBlockType { Header, Data };

spatial/src/spatial/gdal/functions/st_drivers.cpp

@@ -27,7 +27,8 @@ unique_ptr<FunctionData> GdalDriversTableFunction::Bind(ClientContext &context,
 	names.emplace_back("help_url");
 
 	auto driver_count = GDALGetDriverCount();
-	return make_uniq<BindData>(driver_count);
+	auto result = make_uniq<BindData>(driver_count);
+	return std::move(result);
 }
 
 unique_ptr<GlobalTableFunctionState> GdalDriversTableFunction::Init(ClientContext &context,