duckdb 0.8.1-dev51.0 → 0.8.1-dev96.0

package/src/duckdb/src/include/duckdb/storage/table/column_checkpoint_state.hpp

@@ -42,6 +42,18 @@ public:
 
 	virtual void FlushSegment(unique_ptr<ColumnSegment> segment, idx_t segment_size);
 	virtual void WriteDataPointers(RowGroupWriter &writer);
+
+public:
+	template <class TARGET>
+	TARGET &Cast() {
+		D_ASSERT(dynamic_cast<TARGET *>(this));
+		return reinterpret_cast<TARGET &>(*this);
+	}
+	template <class TARGET>
+	const TARGET &Cast() const {
+		D_ASSERT(dynamic_cast<const TARGET *>(this));
+		return reinterpret_cast<const TARGET &>(*this);
+	}
 };
 
 struct PartialBlockForCheckpoint : public PartialBlock {

package/src/duckdb/src/include/duckdb/storage/table/scan_state.hpp

@@ -35,11 +35,33 @@ class RowGroupSegmentTree;
 struct SegmentScanState {
 	virtual ~SegmentScanState() {
 	}
+
+	template <class TARGET>
+	TARGET &Cast() {
+		D_ASSERT(dynamic_cast<TARGET *>(this));
+		return reinterpret_cast<TARGET &>(*this);
+	}
+	template <class TARGET>
+	const TARGET &Cast() const {
+		D_ASSERT(dynamic_cast<const TARGET *>(this));
+		return reinterpret_cast<const TARGET &>(*this);
+	}
 };
 
 struct IndexScanState {
 	virtual ~IndexScanState() {
 	}
+
+	template <class TARGET>
+	TARGET &Cast() {
+		D_ASSERT(dynamic_cast<TARGET *>(this));
+		return reinterpret_cast<TARGET &>(*this);
+	}
+	template <class TARGET>
+	const TARGET &Cast() const {
+		D_ASSERT(dynamic_cast<const TARGET *>(this));
+		return reinterpret_cast<const TARGET &>(*this);
+	}
 };
 
 typedef unordered_map<block_id_t, BufferHandle> buffer_handle_set_t;

package/src/duckdb/src/include/duckdb/transaction/duck_transaction_manager.hpp

@@ -46,9 +46,9 @@ public:
 	}
 
 private:
-	bool CanCheckpoint(DuckTransaction *current = nullptr);
+	bool CanCheckpoint(optional_ptr<DuckTransaction> current = nullptr);
 	//! Remove the given transaction from the list of active transactions
-	void RemoveTransaction(DuckTransaction *transaction) noexcept;
+	void RemoveTransaction(DuckTransaction &transaction) noexcept;
 	void LockClients(vector<ClientLockWrapper> &client_locks, ClientContext &context);
 
 private:

package/src/duckdb/src/include/duckdb/transaction/transaction.hpp

@@ -62,12 +62,12 @@ public:
 	template <class TARGET>
 	TARGET &Cast() {
 		D_ASSERT(dynamic_cast<TARGET *>(this));
-		return (TARGET &)*this;
+		return reinterpret_cast<TARGET &>(*this);
 	}
 	template <class TARGET>
 	const TARGET &Cast() const {
 		D_ASSERT(dynamic_cast<const TARGET *>(this));
-		return (const TARGET &)*this;
+		return reinterpret_cast<const TARGET &>(*this);
 	}
 };
 

package/src/duckdb/src/main/capi/appender-c.cpp

@@ -12,7 +12,7 @@ using duckdb::timestamp_t;
 
 duckdb_state duckdb_appender_create(duckdb_connection connection, const char *schema, const char *table,
                                     duckdb_appender *out_appender) {
-	Connection *conn = (Connection *)connection;
+	Connection *conn = reinterpret_cast<Connection *>(connection);
 
 	if (!connection || !table || !out_appender) {
 		return DuckDBError;
@@ -39,7 +39,7 @@ duckdb_state duckdb_appender_destroy(duckdb_appender *appender) {
 		return DuckDBError;
 	}
 	duckdb_appender_close(*appender);
-	auto wrapper = (AppenderWrapper *)*appender;
+	auto wrapper = reinterpret_cast<AppenderWrapper *>(*appender);
 	if (wrapper) {
 		delete wrapper;
 	}
@@ -52,7 +52,7 @@ duckdb_state duckdb_appender_run_function(duckdb_appender appender, FUN &&functi
 	if (!appender) {
 		return DuckDBError;
 	}
-	auto wrapper = (AppenderWrapper *)appender;
+	auto wrapper = reinterpret_cast<AppenderWrapper *>(appender);
 	if (!wrapper->appender) {
 		return DuckDBError;
 	}
@@ -72,7 +72,7 @@ const char *duckdb_appender_error(duckdb_appender appender) {
 	if (!appender) {
 		return nullptr;
 	}
-	auto wrapper = (AppenderWrapper *)appender;
+	auto wrapper = reinterpret_cast<AppenderWrapper *>(appender);
 	if (wrapper->error.empty()) {
 		return nullptr;
 	}
@@ -92,7 +92,7 @@ duckdb_state duckdb_append_internal(duckdb_appender appender, T value) {
 	if (!appender) {
 		return DuckDBError;
 	}
-	auto *appender_instance = (AppenderWrapper *)appender;
+	auto *appender_instance = reinterpret_cast<AppenderWrapper *>(appender);
 	try {
 		appender_instance->appender->Append<T>(value);
 	} catch (std::exception &ex) {

package/src/duckdb/src/main/capi/arrow-c.cpp

@@ -23,7 +23,7 @@ duckdb_state duckdb_query_arrow_schema(duckdb_arrow result, duckdb_arrow_schema
 	if (!out_schema) {
 		return DuckDBSuccess;
 	}
-	auto wrapper = (ArrowResultWrapper *)result;
+	auto wrapper = reinterpret_cast<ArrowResultWrapper *>(result);
 	ArrowConverter::ToArrowSchema((ArrowSchema *)*out_schema, wrapper->result->types, wrapper->result->names,
 	                              wrapper->timezone_config);
 	return DuckDBSuccess;
@@ -33,7 +33,7 @@ duckdb_state duckdb_query_arrow_array(duckdb_arrow result, duckdb_arrow_array *o
 	if (!out_array) {
 		return DuckDBSuccess;
 	}
-	auto wrapper = (ArrowResultWrapper *)result;
+	auto wrapper = reinterpret_cast<ArrowResultWrapper *>(result);
 	auto success = wrapper->result->TryFetch(wrapper->current_chunk, wrapper->result->GetErrorObject());
 	if (!success) { // LCOV_EXCL_START
 		return DuckDBError;
@@ -41,12 +41,12 @@ duckdb_state duckdb_query_arrow_array(duckdb_arrow result, duckdb_arrow_array *o
 	if (!wrapper->current_chunk || wrapper->current_chunk->size() == 0) {
 		return DuckDBSuccess;
 	}
-	ArrowConverter::ToArrowArray(*wrapper->current_chunk, (ArrowArray *)*out_array);
+	ArrowConverter::ToArrowArray(*wrapper->current_chunk, reinterpret_cast<ArrowArray *>(*out_array));
 	return DuckDBSuccess;
 }
 
 idx_t duckdb_arrow_row_count(duckdb_arrow result) {
-	auto wrapper = (ArrowResultWrapper *)result;
+	auto wrapper = reinterpret_cast<ArrowResultWrapper *>(result);
 	if (wrapper->result->HasError()) {
 		return 0;
 	}
@@ -54,12 +54,12 @@ idx_t duckdb_arrow_row_count(duckdb_arrow result) {
 }
 
 idx_t duckdb_arrow_column_count(duckdb_arrow result) {
-	auto wrapper = (ArrowResultWrapper *)result;
+	auto wrapper = reinterpret_cast<ArrowResultWrapper *>(result);
 	return wrapper->result->ColumnCount();
 }
 
 idx_t duckdb_arrow_rows_changed(duckdb_arrow result) {
-	auto wrapper = (ArrowResultWrapper *)result;
+	auto wrapper = reinterpret_cast<ArrowResultWrapper *>(result);
 	if (wrapper->result->HasError()) {
 		return 0;
 	}
@@ -76,20 +76,20 @@ idx_t duckdb_arrow_rows_changed(duckdb_arrow result) {
 }
 
 const char *duckdb_query_arrow_error(duckdb_arrow result) {
-	auto wrapper = (ArrowResultWrapper *)result;
+	auto wrapper = reinterpret_cast<ArrowResultWrapper *>(result);
 	return wrapper->result->GetError().c_str();
 }
 
 void duckdb_destroy_arrow(duckdb_arrow *result) {
 	if (*result) {
-		auto wrapper = (ArrowResultWrapper *)*result;
+		auto wrapper = reinterpret_cast<ArrowResultWrapper *>(*result);
 		delete wrapper;
 		*result = nullptr;
 	}
 }
 
 duckdb_state duckdb_execute_prepared_arrow(duckdb_prepared_statement prepared_statement, duckdb_arrow *out_result) {
-	auto wrapper = (PreparedStatementWrapper *)prepared_statement;
+	auto wrapper = reinterpret_cast<PreparedStatementWrapper *>(prepared_statement);
 	if (!wrapper || !wrapper->statement || wrapper->statement->HasError() || !out_result) {
 		return DuckDBError;
 	}
@@ -105,6 +105,6 @@ duckdb_state duckdb_execute_prepared_arrow(duckdb_prepared_statement prepared_st
 	auto result = wrapper->statement->Execute(wrapper->values, false);
 	D_ASSERT(result->type == QueryResultType::MATERIALIZED_RESULT);
 	arrow_wrapper->result = duckdb::unique_ptr_cast<QueryResult, MaterializedQueryResult>(std::move(result));
-	*out_result = (duckdb_arrow)arrow_wrapper;
+	*out_result = reinterpret_cast<duckdb_arrow>(arrow_wrapper);
 	return !arrow_wrapper->result->HasError() ? DuckDBSuccess : DuckDBError;
 }

package/src/duckdb/src/main/capi/cast/from_decimal-c.cpp

@@ -34,7 +34,7 @@ bool CastDecimalCInternal(duckdb_result *source, duckdb_string &result, idx_t co
 	default:
 		throw duckdb::InternalException("Unimplemented internal type for decimal");
 	}
-	result.data = (char *)duckdb_malloc(sizeof(char) * (result_string.GetSize() + 1));
+	result.data = reinterpret_cast<char *>(duckdb_malloc(sizeof(char) * (result_string.GetSize() + 1)));
 	memcpy(result.data, result_string.GetData(), result_string.GetSize());
 	result.data[result_string.GetSize()] = '\0';
 	result.size = result_string.GetSize();

package/src/duckdb/src/main/capi/cast/utils-c.cpp

@@ -68,7 +68,7 @@ duckdb_blob FetchDefaultValue::Operation() {
 
 template <>
 bool FromCBlobCastWrapper::Operation(duckdb_blob input, duckdb_string &result) {
-	string_t input_str((const char *)input.data, input.size);
+	string_t input_str(const_char_ptr_cast(input.data), input.size);
 	return ToCStringCastWrapper<duckdb::CastFromBlob>::template Operation<string_t, duckdb_string>(input_str, result);
 }
 

package/src/duckdb/src/main/capi/config-c.cpp

@@ -16,7 +16,7 @@ duckdb_state duckdb_create_config(duckdb_config *out_config) {
 	} catch (...) { // LCOV_EXCL_START
 		return DuckDBError;
 	} // LCOV_EXCL_STOP
-	*out_config = (duckdb_config)config;
+	*out_config = reinterpret_cast<duckdb_config>(config);
 	return DuckDBSuccess;
 }
 

package/src/duckdb/src/main/capi/data_chunk-c.cpp

@@ -10,7 +10,7 @@ duckdb_data_chunk duckdb_create_data_chunk(duckdb_logical_type *ctypes, idx_t co
 	}
 	duckdb::vector<duckdb::LogicalType> types;
 	for (idx_t i = 0; i < column_count; i++) {
-		auto ltype = (duckdb::LogicalType *)ctypes[i];
+		auto ltype = reinterpret_cast<duckdb::LogicalType *>(ctypes[i]);
 		types.push_back(*ltype);
 	}
 
@@ -21,7 +21,7 @@ duckdb_data_chunk duckdb_create_data_chunk(duckdb_logical_type *ctypes, idx_t co
 
 void duckdb_destroy_data_chunk(duckdb_data_chunk *chunk) {
 	if (chunk && *chunk) {
-		auto dchunk = (duckdb::DataChunk *)*chunk;
+		auto dchunk = reinterpret_cast<duckdb::DataChunk *>(*chunk);
 		delete dchunk;
 		*chunk = nullptr;
 	}
@@ -31,7 +31,7 @@ void duckdb_data_chunk_reset(duckdb_data_chunk chunk) {
 	if (!chunk) {
 		return;
 	}
-	auto dchunk = (duckdb::DataChunk *)chunk;
+	auto dchunk = reinterpret_cast<duckdb::DataChunk *>(chunk);
 	dchunk->Reset();
 }
 
@@ -39,7 +39,7 @@ idx_t duckdb_data_chunk_get_column_count(duckdb_data_chunk chunk) {
 	if (!chunk) {
 		return 0;
 	}
-	auto dchunk = (duckdb::DataChunk *)chunk;
+	auto dchunk = reinterpret_cast<duckdb::DataChunk *>(chunk);
 	return dchunk->ColumnCount();
 }
 
@@ -47,7 +47,7 @@ duckdb_vector duckdb_data_chunk_get_vector(duckdb_data_chunk chunk, idx_t col_id
 	if (!chunk || col_idx >= duckdb_data_chunk_get_column_count(chunk)) {
 		return nullptr;
 	}
-	auto dchunk = (duckdb::DataChunk *)chunk;
+	auto dchunk = reinterpret_cast<duckdb::DataChunk *>(chunk);
 	return reinterpret_cast<duckdb_vector>(&dchunk->data[col_idx]);
 }
 
@@ -55,7 +55,7 @@ idx_t duckdb_data_chunk_get_size(duckdb_data_chunk chunk) {
 	if (!chunk) {
 		return 0;
 	}
-	auto dchunk = (duckdb::DataChunk *)chunk;
+	auto dchunk = reinterpret_cast<duckdb::DataChunk *>(chunk);
 	return dchunk->size();
 }
 
@@ -63,7 +63,7 @@ void duckdb_data_chunk_set_size(duckdb_data_chunk chunk, idx_t size) {
 	if (!chunk) {
 		return;
 	}
-	auto dchunk = (duckdb::DataChunk *)chunk;
+	auto dchunk = reinterpret_cast<duckdb::DataChunk *>(chunk);
 	dchunk->SetCardinality(size);
 }
 
@@ -71,7 +71,7 @@ duckdb_logical_type duckdb_vector_get_column_type(duckdb_vector vector) {
 	if (!vector) {
 		return nullptr;
 	}
-	auto v = (duckdb::Vector *)vector;
+	auto v = reinterpret_cast<duckdb::Vector *>(vector);
 	return reinterpret_cast<duckdb_logical_type>(new duckdb::LogicalType(v->GetType()));
 }
 
@@ -79,7 +79,7 @@ void *duckdb_vector_get_data(duckdb_vector vector) {
 	if (!vector) {
 		return nullptr;
 	}
-	auto v = (duckdb::Vector *)vector;
+	auto v = reinterpret_cast<duckdb::Vector *>(vector);
 	return duckdb::FlatVector::GetData(*v);
 }
 
@@ -87,7 +87,7 @@ uint64_t *duckdb_vector_get_validity(duckdb_vector vector) {
 	if (!vector) {
 		return nullptr;
 	}
-	auto v = (duckdb::Vector *)vector;
+	auto v = reinterpret_cast<duckdb::Vector *>(vector);
 	return duckdb::FlatVector::Validity(*v).GetData();
 }
 
@@ -95,7 +95,7 @@ void duckdb_vector_ensure_validity_writable(duckdb_vector vector) {
 	if (!vector) {
 		return;
 	}
-	auto v = (duckdb::Vector *)vector;
+	auto v = reinterpret_cast<duckdb::Vector *>(vector);
 	auto &validity = duckdb::FlatVector::Validity(*v);
 	validity.EnsureWritable();
 }
@@ -108,7 +108,7 @@ void duckdb_vector_assign_string_element_len(duckdb_vector vector, idx_t index,
 	if (!vector) {
 		return;
 	}
-	auto v = (duckdb::Vector *)vector;
+	auto v = reinterpret_cast<duckdb::Vector *>(vector);
 	auto data = duckdb::FlatVector::GetData<duckdb::string_t>(*v);
 	data[index] = duckdb::StringVector::AddString(*v, str, str_len);
 }
@@ -117,7 +117,7 @@ duckdb_vector duckdb_list_vector_get_child(duckdb_vector vector) {
 	if (!vector) {
 		return nullptr;
 	}
-	auto v = (duckdb::Vector *)vector;
+	auto v = reinterpret_cast<duckdb::Vector *>(vector);
 	return reinterpret_cast<duckdb_vector>(&duckdb::ListVector::GetEntry(*v));
 }
 
@@ -125,7 +125,7 @@ idx_t duckdb_list_vector_get_size(duckdb_vector vector) {
 	if (!vector) {
 		return 0;
 	}
-	auto v = (duckdb::Vector *)vector;
+	auto v = reinterpret_cast<duckdb::Vector *>(vector);
 	return duckdb::ListVector::GetListSize(*v);
 }
 
@@ -133,7 +133,7 @@ duckdb_state duckdb_list_vector_set_size(duckdb_vector vector, idx_t size) {
 	if (!vector) {
 		return duckdb_state::DuckDBError;
 	}
-	auto v = (duckdb::Vector *)vector;
+	auto v = reinterpret_cast<duckdb::Vector *>(vector);
 	duckdb::ListVector::SetListSize(*v, size);
 	return duckdb_state::DuckDBSuccess;
 }
@@ -142,7 +142,7 @@ duckdb_state duckdb_list_vector_reserve(duckdb_vector vector, idx_t required_cap
 	if (!vector) {
 		return duckdb_state::DuckDBError;
 	}
-	auto v = (duckdb::Vector *)vector;
+	auto v = reinterpret_cast<duckdb::Vector *>(vector);
 	duckdb::ListVector::Reserve(*v, required_capacity);
 	return duckdb_state::DuckDBSuccess;
 }
@@ -151,7 +151,7 @@ duckdb_vector duckdb_struct_vector_get_child(duckdb_vector vector, idx_t index)
 	if (!vector) {
 		return nullptr;
 	}
-	auto v = (duckdb::Vector *)vector;
+	auto v = reinterpret_cast<duckdb::Vector *>(vector);
 	return reinterpret_cast<duckdb_vector>(duckdb::StructVector::GetEntries(*v)[index].get());
 }
 

package/src/duckdb/src/main/capi/duckdb-c.cpp

@@ -33,7 +33,7 @@ duckdb_state duckdb_open(const char *path, duckdb_database *out) {
 
 void duckdb_close(duckdb_database *database) {
 	if (database && *database) {
-		auto wrapper = (DatabaseData *)*database;
+		auto wrapper = reinterpret_cast<DatabaseData *>(*database);
 		delete wrapper;
 		*database = nullptr;
 	}
@@ -43,7 +43,7 @@ duckdb_state duckdb_connect(duckdb_database database, duckdb_connection *out) {
 	if (!database || !out) {
 		return DuckDBError;
 	}
-	auto wrapper = (DatabaseData *)database;
+	auto wrapper = reinterpret_cast<DatabaseData *>(database);
 	Connection *connection;
 	try {
 		connection = new Connection(*wrapper->database);
@@ -56,14 +56,14 @@ duckdb_state duckdb_connect(duckdb_database database, duckdb_connection *out) {
 
 void duckdb_disconnect(duckdb_connection *connection) {
 	if (connection && *connection) {
-		Connection *conn = (Connection *)*connection;
+		Connection *conn = reinterpret_cast<Connection *>(*connection);
 		delete conn;
 		*connection = nullptr;
 	}
 }
 
 duckdb_state duckdb_query(duckdb_connection connection, const char *query, duckdb_result *out) {
-	Connection *conn = (Connection *)connection;
+	Connection *conn = reinterpret_cast<Connection *>(connection);
 	auto result = conn->Query(query);
 	return duckdb_translate_result(std::move(result), out);
 }

package/src/duckdb/src/main/capi/duckdb_value-c.cpp

@@ -2,7 +2,7 @@
 
 void duckdb_destroy_value(duckdb_value *value) {
 	if (value && *value) {
-		auto val = (duckdb::Value *)*value;
+		auto val = reinterpret_cast<duckdb::Value *>(*value);
 		delete val;
 		*value = nullptr;
 	}
@@ -22,18 +22,18 @@ duckdb_value duckdb_create_int64(int64_t input) {
 }
 
 char *duckdb_get_varchar(duckdb_value value) {
-	auto val = (duckdb::Value *)value;
+	auto val = reinterpret_cast<duckdb::Value *>(value);
 	auto str_val = val->DefaultCastAs(duckdb::LogicalType::VARCHAR);
 	auto &str = duckdb::StringValue::Get(str_val);
 
-	auto result = (char *)malloc(sizeof(char *) * (str.size() + 1));
+	auto result = reinterpret_cast<char *>(malloc(sizeof(char *) * (str.size() + 1)));
 	memcpy(result, str.c_str(), str.size());
 	result[str.size()] = '\0';
 	return result;
 }
 
 int64_t duckdb_get_int64(duckdb_value value) {
-	auto val = (duckdb::Value *)value;
+	auto val = reinterpret_cast<duckdb::Value *>(value);
 	if (!val->DefaultTryCastAs(duckdb::LogicalType::BIGINT)) {
 		return 0;
 	}

package/src/duckdb/src/main/capi/logical_types-c.cpp

@@ -4,7 +4,7 @@ static bool AssertLogicalTypeId(duckdb_logical_type type, duckdb::LogicalTypeId
 	if (!type) {
 		return false;
 	}
-	auto &ltype = *((duckdb::LogicalType *)type);
+	auto &ltype = *(reinterpret_cast<duckdb::LogicalType *>(type));
 	if (ltype.id() != type_id) {
 		return false;
 	}
@@ -15,7 +15,7 @@ static bool AssertInternalType(duckdb_logical_type type, duckdb::PhysicalType ph
 	if (!type) {
 		return false;
 	}
-	auto &ltype = *((duckdb::LogicalType *)type);
+	auto &ltype = *(reinterpret_cast<duckdb::LogicalType *>(type));
 	if (ltype.InternalType() != physical_type) {
 		return false;
 	}
@@ -31,7 +31,7 @@ duckdb_logical_type duckdb_create_list_type(duckdb_logical_type type) {
 		return nullptr;
 	}
 	duckdb::LogicalType *ltype = new duckdb::LogicalType;
-	*ltype = duckdb::LogicalType::LIST(*(duckdb::LogicalType *)type);
+	*ltype = duckdb::LogicalType::LIST(*reinterpret_cast<duckdb::LogicalType *>(type));
 	return reinterpret_cast<duckdb_logical_type>(ltype);
 }
 
@@ -40,7 +40,7 @@ duckdb_logical_type duckdb_create_union_type(duckdb_logical_type member_types_p,
 	if (!member_types_p || !member_names) {
 		return nullptr;
 	}
-	duckdb::LogicalType *member_types = (duckdb::LogicalType *)member_types_p;
+	duckdb::LogicalType *member_types = reinterpret_cast<duckdb::LogicalType *>(member_types_p);
 	duckdb::LogicalType *mtype = new duckdb::LogicalType;
 	duckdb::child_list_t<duckdb::LogicalType> members;
 
@@ -56,7 +56,8 @@ duckdb_logical_type duckdb_create_map_type(duckdb_logical_type key_type, duckdb_
 		return nullptr;
 	}
 	duckdb::LogicalType *mtype = new duckdb::LogicalType;
-	*mtype = duckdb::LogicalType::MAP(*(duckdb::LogicalType *)key_type, *(duckdb::LogicalType *)value_type);
+	*mtype = duckdb::LogicalType::MAP(*reinterpret_cast<duckdb::LogicalType *>(key_type),
+	                                  *reinterpret_cast<duckdb::LogicalType *>(value_type));
 	return reinterpret_cast<duckdb_logical_type>(mtype);
 }
 
@@ -68,13 +69,13 @@ duckdb_type duckdb_get_type_id(duckdb_logical_type type) {
 	if (!type) {
 		return DUCKDB_TYPE_INVALID;
 	}
-	auto ltype = (duckdb::LogicalType *)type;
+	auto ltype = reinterpret_cast<duckdb::LogicalType *>(type);
 	return duckdb::ConvertCPPTypeToC(*ltype);
 }
 
 void duckdb_destroy_logical_type(duckdb_logical_type *type) {
 	if (type && *type) {
-		auto ltype = (duckdb::LogicalType *)*type;
+		auto ltype = reinterpret_cast<duckdb::LogicalType *>(*type);
 		delete ltype;
 		*type = nullptr;
 	}
@@ -84,7 +85,7 @@ uint8_t duckdb_decimal_width(duckdb_logical_type type) {
 	if (!AssertLogicalTypeId(type, duckdb::LogicalTypeId::DECIMAL)) {
 		return 0;
 	}
-	auto &ltype = *((duckdb::LogicalType *)type);
+	auto &ltype = *(reinterpret_cast<duckdb::LogicalType *>(type));
 	return duckdb::DecimalType::GetWidth(ltype);
 }
 
@@ -92,7 +93,7 @@ uint8_t duckdb_decimal_scale(duckdb_logical_type type) {
 	if (!AssertLogicalTypeId(type, duckdb::LogicalTypeId::DECIMAL)) {
 		return 0;
 	}
-	auto &ltype = *((duckdb::LogicalType *)type);
+	auto &ltype = *(reinterpret_cast<duckdb::LogicalType *>(type));
 	return duckdb::DecimalType::GetScale(ltype);
 }
 
@@ -100,7 +101,7 @@ duckdb_type duckdb_decimal_internal_type(duckdb_logical_type type) {
 	if (!AssertLogicalTypeId(type, duckdb::LogicalTypeId::DECIMAL)) {
 		return DUCKDB_TYPE_INVALID;
 	}
-	auto &ltype = *((duckdb::LogicalType *)type);
+	auto &ltype = *(reinterpret_cast<duckdb::LogicalType *>(type));
 	switch (ltype.InternalType()) {
 	case duckdb::PhysicalType::INT16:
 		return DUCKDB_TYPE_SMALLINT;
@@ -119,7 +120,7 @@ duckdb_type duckdb_enum_internal_type(duckdb_logical_type type) {
 	if (!AssertLogicalTypeId(type, duckdb::LogicalTypeId::ENUM)) {
 		return DUCKDB_TYPE_INVALID;
 	}
-	auto &ltype = *((duckdb::LogicalType *)type);
+	auto &ltype = *(reinterpret_cast<duckdb::LogicalType *>(type));
 	switch (ltype.InternalType()) {
 	case duckdb::PhysicalType::UINT8:
 		return DUCKDB_TYPE_UTINYINT;
@@ -136,7 +137,7 @@ uint32_t duckdb_enum_dictionary_size(duckdb_logical_type type) {
 	if (!AssertLogicalTypeId(type, duckdb::LogicalTypeId::ENUM)) {
 		return 0;
 	}
-	auto &ltype = *((duckdb::LogicalType *)type);
+	auto &ltype = *(reinterpret_cast<duckdb::LogicalType *>(type));
 	return duckdb::EnumType::GetSize(ltype);
 }
 
@@ -144,7 +145,7 @@ char *duckdb_enum_dictionary_value(duckdb_logical_type type, idx_t index) {
 	if (!AssertLogicalTypeId(type, duckdb::LogicalTypeId::ENUM)) {
 		return nullptr;
 	}
-	auto &ltype = *((duckdb::LogicalType *)type);
+	auto &ltype = *(reinterpret_cast<duckdb::LogicalType *>(type));
 	auto &vector = duckdb::EnumType::GetValuesInsertOrder(ltype);
 	auto value = vector.GetValue(index);
 	return strdup(duckdb::StringValue::Get(value).c_str());
@@ -155,7 +156,7 @@ duckdb_logical_type duckdb_list_type_child_type(duckdb_logical_type type) {
 	    !AssertLogicalTypeId(type, duckdb::LogicalTypeId::MAP)) {
 		return nullptr;
 	}
-	auto &ltype = *((duckdb::LogicalType *)type);
+	auto &ltype = *(reinterpret_cast<duckdb::LogicalType *>(type));
 	if (ltype.id() != duckdb::LogicalTypeId::LIST && ltype.id() != duckdb::LogicalTypeId::MAP) {
 		return nullptr;
 	}
@@ -166,7 +167,7 @@ duckdb_logical_type duckdb_map_type_key_type(duckdb_logical_type type) {
 	if (!AssertLogicalTypeId(type, duckdb::LogicalTypeId::MAP)) {
 		return nullptr;
 	}
-	auto &mtype = *((duckdb::LogicalType *)type);
+	auto &mtype = *(reinterpret_cast<duckdb::LogicalType *>(type));
 	if (mtype.id() != duckdb::LogicalTypeId::MAP) {
 		return nullptr;
 	}
@@ -177,7 +178,7 @@ duckdb_logical_type duckdb_map_type_value_type(duckdb_logical_type type) {
 	if (!AssertLogicalTypeId(type, duckdb::LogicalTypeId::MAP)) {
 		return nullptr;
 	}
-	auto &mtype = *((duckdb::LogicalType *)type);
+	auto &mtype = *(reinterpret_cast<duckdb::LogicalType *>(type));
 	if (mtype.id() != duckdb::LogicalTypeId::MAP) {
 		return nullptr;
 	}
@@ -188,7 +189,7 @@ idx_t duckdb_struct_type_child_count(duckdb_logical_type type) {
 	if (!AssertInternalType(type, duckdb::PhysicalType::STRUCT)) {
 		return 0;
 	}
-	auto &ltype = *((duckdb::LogicalType *)type);
+	auto &ltype = *(reinterpret_cast<duckdb::LogicalType *>(type));
 	return duckdb::StructType::GetChildCount(ltype);
 }
 
@@ -210,7 +211,7 @@ char *duckdb_union_type_member_name(duckdb_logical_type type, idx_t index) {
 	if (!AssertLogicalTypeId(type, duckdb::LogicalTypeId::UNION)) {
 		return nullptr;
 	}
-	auto &ltype = *((duckdb::LogicalType *)type);
+	auto &ltype = *(reinterpret_cast<duckdb::LogicalType *>(type));
 	return strdup(duckdb::UnionType::GetMemberName(ltype, index).c_str());
 }
 
@@ -221,7 +222,7 @@ duckdb_logical_type duckdb_union_type_member_type(duckdb_logical_type type, idx_
 	if (!AssertLogicalTypeId(type, duckdb::LogicalTypeId::UNION)) {
 		return nullptr;
 	}
-	auto &ltype = *((duckdb::LogicalType *)type);
+	auto &ltype = *(reinterpret_cast<duckdb::LogicalType *>(type));
 	return reinterpret_cast<duckdb_logical_type>(
 	    new duckdb::LogicalType(duckdb::UnionType::GetMemberType(ltype, index)));
 }
@@ -230,7 +231,7 @@ char *duckdb_struct_type_child_name(duckdb_logical_type type, idx_t index) {
 	if (!AssertInternalType(type, duckdb::PhysicalType::STRUCT)) {
 		return nullptr;
 	}
-	auto &ltype = *((duckdb::LogicalType *)type);
+	auto &ltype = *(reinterpret_cast<duckdb::LogicalType *>(type));
 	return strdup(duckdb::StructType::GetChildName(ltype, index).c_str());
 }
 
@@ -238,7 +239,7 @@ duckdb_logical_type duckdb_struct_type_child_type(duckdb_logical_type type, idx_
 	if (!AssertInternalType(type, duckdb::PhysicalType::STRUCT)) {
 		return nullptr;
 	}
-	auto &ltype = *((duckdb::LogicalType *)type);
+	auto &ltype = *(reinterpret_cast<duckdb::LogicalType *>(type));
 	if (ltype.InternalType() != duckdb::PhysicalType::STRUCT) {
 		return nullptr;
 	}