Restore basic support for spatial

Author: evertlammerts

src/duckdb_py/native/python_objects.cpp

@@ -444,6 +444,7 @@ static bool KeyIsHashable(const LogicalType &type) {
 	case LogicalTypeId::DATE:
 	case LogicalTypeId::UUID:
 	case LogicalTypeId::INTERVAL:
+	case LogicalTypeId::GEOMETRY:
 		return true;
 	case LogicalTypeId::LIST:
 	case LogicalTypeId::ARRAY:
@@ -511,6 +512,7 @@ py::object PythonObject::FromValue(const Value &val, const LogicalType &type,
 	case LogicalTypeId::VARCHAR:
 		return py::cast(StringValue::Get(val));
 	case LogicalTypeId::BLOB:
+	case LogicalTypeId::GEOMETRY:
 		return py::bytes(StringValue::Get(val));
 	case LogicalTypeId::BIT:
 		return py::cast(Bit::ToString(StringValue::Get(val)));

src/duckdb_py/numpy/array_wrapper.cpp

@@ -682,6 +682,7 @@ void ArrayWrapper::Append(idx_t current_offset, Vector &input, idx_t source_size
 		may_have_null = ConvertColumn<string_t, PyObject *, duckdb_py_convert::StringConvert>(append_data);
 		break;
 	case LogicalTypeId::BLOB:
+	case LogicalTypeId::GEOMETRY:
 		may_have_null = ConvertColumn<string_t, PyObject *, duckdb_py_convert::BlobConvert>(append_data);
 		break;
 	case LogicalTypeId::BIT:

src/duckdb_py/numpy/raw_array_wrapper.cpp

@@ -61,6 +61,7 @@ static idx_t GetNumpyTypeWidth(const LogicalType &type) {
 	case LogicalTypeId::UUID:
 	case LogicalTypeId::ARRAY:
 	case LogicalTypeId::VARIANT:
+	case LogicalTypeId::GEOMETRY:
 		return sizeof(PyObject *);
 	default:
 		throw NotImplementedException("Unsupported type \"%s\" for DuckDB -> NumPy conversion", type.ToString());
@@ -124,6 +125,7 @@ string RawArrayWrapper::DuckDBToNumpyDtype(const LogicalType &type) {
 	case LogicalTypeId::UUID:
 	case LogicalTypeId::ARRAY:
 	case LogicalTypeId::VARIANT:
+	case LogicalTypeId::GEOMETRY:
 		return "object";
 	case LogicalTypeId::ENUM: {
 		auto size = EnumType::GetSize(type);

tests/fast/types/test_geometry.py

@@ -0,0 +1,30 @@
+import pandas as pd
+
+
+class TestGeometry:
+    def test_fetchall(self, duckdb_cursor):
+        duckdb_cursor.execute("SELECT 'POINT(1 2)'::GEOMETRY AS geom")
+        results = duckdb_cursor.fetchall()
+        assert isinstance(results[0][0], bytes)
+
+    def test_fetchnumpy(self, duckdb_cursor):
+        duckdb_cursor.execute("SELECT 'POINT(1 2)'::GEOMETRY AS geom")
+        results = duckdb_cursor.fetchnumpy()
+        assert isinstance(results["geom"][0], (bytes, bytearray))
+
+    def test_df(self, duckdb_cursor):
+        duckdb_cursor.execute("SELECT 'POINT(1 2)'::GEOMETRY AS geom")
+        df = duckdb_cursor.df()
+        assert isinstance(df["geom"].iloc[0], (bytes, bytearray))
+
+    def test_null(self, duckdb_cursor):
+        duckdb_cursor.execute("SELECT NULL::GEOMETRY AS geom")
+        results = duckdb_cursor.fetchall()
+        assert results[0][0] is None
+
+    def test_multiple_rows(self, duckdb_cursor):
+        duckdb_cursor.execute("SELECT 'POINT(1 2)'::GEOMETRY AS geom UNION ALL SELECT NULL::GEOMETRY")
+        df = duckdb_cursor.df()
+        assert df.shape[0] == 2
+        assert isinstance(df["geom"].iloc[0], (bytes, bytearray))
+        assert pd.isna(df["geom"].iloc[1])