nanobind: enum-instance acceptance in STRING_INT caster; .none() on join other_rel

Author: evertlammerts

src/duckdb_py/include/duckdb_python/pybind11/conversions/enum_string_caster.hpp

@@ -40,6 +40,13 @@
 					value = FromIntegerFn(nanobind::cast<int64_t>(src));                                            \
 					return true;                                                                                    \
 				}                                                                                                   \
+				/* Registered nb::enum_ instances aren't int subclasses (unlike pybind11's), so accept a member  */ \
+				/* of the registered enum by reading its integer .value.                                         */ \
+				nanobind::handle enum_type = nanobind::type<EnumType>();                                            \
+				if (enum_type.is_valid() && PyObject_IsInstance(src.ptr(), enum_type.ptr()) == 1) {                 \
+					value = FromIntegerFn(nanobind::cast<int64_t>(src.attr("value")));                              \
+					return true;                                                                                    \
+				}                                                                                                   \
 			} catch (...) {                                                                                          \
 				return false;                                                                                       \
 			}                                                                                                       \

src/duckdb_py/pyrelation/initialize.cpp

@@ -325,7 +325,7 @@ void DuckDBPyRelation::Initialize(py::handle &m) {
 	    .def("join", &DuckDBPyRelation::Join,
 	         "Join the relation object with another relation object in other_rel using the join condition expression "
 	         "in join_condition. Types supported are 'inner', 'left', 'right', 'outer', 'semi' and 'anti'",
-	         py::arg("other_rel"), py::arg("condition"), py::arg("how") = "inner")
+	         py::arg("other_rel").none(), py::arg("condition"), py::arg("how") = "inner")
 	    .def("cross", &DuckDBPyRelation::Cross, "Create cross/cartesian product of two relational objects",
 	         py::arg("other_rel"))