duckdb 0.10.1-dev9.0 → 0.10.1

package/src/duckdb/src/function/cast/time_casts.cpp

@@ -125,6 +125,10 @@ BoundCastInfo DefaultCasts::TimestampNsCastSwitch(BindCastInput &input, const Lo
 		// timestamp (ns) to timestamp (us)
 		return BoundCastInfo(
 		    &VectorCastHelpers::TemplatedCastLoop<timestamp_t, timestamp_t, duckdb::CastTimestampNsToUs>);
+	case LogicalTypeId::TIMESTAMP_TZ:
+		// timestamp (ns) to timestamp with time zone (us)
+		return BoundCastInfo(
+		    &VectorCastHelpers::TemplatedCastLoop<timestamp_t, timestamp_t, duckdb::CastTimestampNsToUs>);
 	default:
 		return TryVectorNullCast;
 	}
@@ -152,6 +156,10 @@ BoundCastInfo DefaultCasts::TimestampMsCastSwitch(BindCastInput &input, const Lo
 		// timestamp (ms) to timestamp (ns)
 		return BoundCastInfo(
 		    &VectorCastHelpers::TemplatedCastLoop<timestamp_t, timestamp_t, duckdb::CastTimestampMsToNs>);
+	case LogicalTypeId::TIMESTAMP_TZ:
+		// timestamp (ms) to timestamp with timezone (us)
+		return BoundCastInfo(
+		    &VectorCastHelpers::TemplatedCastLoop<timestamp_t, timestamp_t, duckdb::CastTimestampMsToUs>);
 	default:
 		return TryVectorNullCast;
 	}
@@ -180,6 +188,10 @@ BoundCastInfo DefaultCasts::TimestampSecCastSwitch(BindCastInput &input, const L
 		// timestamp (s) to timestamp (us)
 		return BoundCastInfo(
 		    &VectorCastHelpers::TemplatedCastLoop<timestamp_t, timestamp_t, duckdb::CastTimestampSecToUs>);
+	case LogicalTypeId::TIMESTAMP_TZ:
+		// timestamp (s) to timestamp with timezone (us)
+		return BoundCastInfo(
+		    &VectorCastHelpers::TemplatedCastLoop<timestamp_t, timestamp_t, duckdb::CastTimestampSecToUs>);
 	case LogicalTypeId::TIMESTAMP_NS:
 		// timestamp (s) to timestamp (ns)
 		return BoundCastInfo(

package/src/duckdb/src/function/cast/ub_duckdb_func_cast.cpp

@@ -0,0 +1,17 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/function/cast/blob_cast.cpp>
+#include </Users/carlo/duckdb/src/function/cast/bit_cast.cpp>
+#include </Users/carlo/duckdb/src/function/cast/cast_function_set.cpp>
+#include </Users/carlo/duckdb/src/function/cast/decimal_cast.cpp>
+#include </Users/carlo/duckdb/src/function/cast/default_casts.cpp>
+#include </Users/carlo/duckdb/src/function/cast/enum_casts.cpp>
+#include </Users/carlo/duckdb/src/function/cast/list_casts.cpp>
+#include </Users/carlo/duckdb/src/function/cast/map_cast.cpp>
+#include </Users/carlo/duckdb/src/function/cast/numeric_casts.cpp>
+#include </Users/carlo/duckdb/src/function/cast/pointer_cast.cpp>
+#include </Users/carlo/duckdb/src/function/cast/string_cast.cpp>
+#include </Users/carlo/duckdb/src/function/cast/struct_cast.cpp>
+#include </Users/carlo/duckdb/src/function/cast/time_casts.cpp>
+#include </Users/carlo/duckdb/src/function/cast/union_casts.cpp>
+#include </Users/carlo/duckdb/src/function/cast/uuid_casts.cpp>
+#include </Users/carlo/duckdb/src/function/cast/vector_cast_helpers.cpp>

package/src/duckdb/src/function/cast/union/ub_duckdb_union_cast.cpp

@@ -0,0 +1,2 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/function/cast/union/from_struct.cpp>

package/src/duckdb/src/function/cast/union_casts.cpp

@@ -1,7 +1,8 @@
+#include "duckdb/common/exception/conversion_exception.hpp"
+#include "duckdb/common/numeric_utils.hpp"
 #include "duckdb/function/cast/cast_function_set.hpp"
 #include "duckdb/function/cast/default_casts.hpp"
 #include "duckdb/function/cast/bound_cast_data.hpp"
-#include "duckdb/common/exception/conversion_exception.hpp"
 
 #include <algorithm> // for std::sort
 
@@ -257,7 +258,7 @@ static bool UnionToUnionCast(Vector &source, Vector &result, idx_t count, CastPa
 			// map the tag
 			auto source_tag = ConstantVector::GetData<union_tag_t>(source_tag_vector)[0];
 			auto mapped_tag = cast_data.tag_map[source_tag];
-			ConstantVector::GetData<union_tag_t>(result_tag_vector)[0] = mapped_tag;
+			ConstantVector::GetData<union_tag_t>(result_tag_vector)[0] = UnsafeNumericCast<union_tag_t>(mapped_tag);
 		}
 	} else {
 		// Otherwise, use the unified vector format to access the source vector.
@@ -279,7 +280,8 @@ static bool UnionToUnionCast(Vector &source, Vector &result, idx_t count, CastPa
 				// map the tag
 				auto source_tag = (UnifiedVectorFormat::GetData<union_tag_t>(source_tag_format))[source_row_idx];
 				auto target_tag = cast_data.tag_map[source_tag];
-				FlatVector::GetData<union_tag_t>(result_tag_vector)[row_idx] = target_tag;
+				FlatVector::GetData<union_tag_t>(result_tag_vector)[row_idx] =
+				    UnsafeNumericCast<union_tag_t>(target_tag);
 			} else {
 
 				// Issue: The members of the result is not always flatvectors
@@ -303,28 +305,24 @@ static bool UnionToVarcharCast(Vector &source, Vector &result, idx_t count, Cast
 	UnionToUnionCast(source, varchar_union, count, parameters);
 
 	// now construct the actual varchar vector
-	varchar_union.Flatten(count);
-	auto &tag_vector = UnionVector::GetTags(source);
-	auto tag_vector_type = tag_vector.GetVectorType();
-	if (tag_vector_type != VectorType::CONSTANT_VECTOR && tag_vector_type != VectorType::FLAT_VECTOR) {
-		tag_vector.Flatten(count);
-	}
+	// varchar_union.Flatten(count);
+	auto &tag_vector = UnionVector::GetTags(varchar_union);
+	UnifiedVectorFormat tag_format;
+	tag_vector.ToUnifiedFormat(count, tag_format);
 
-	auto tags = FlatVector::GetData<union_tag_t>(tag_vector);
-
-	auto &validity = FlatVector::Validity(varchar_union);
 	auto result_data = FlatVector::GetData<string_t>(result);
 
 	for (idx_t i = 0; i < count; i++) {
-		if (!validity.RowIsValid(i)) {
+		auto tag_idx = tag_format.sel->get_index(i);
+		if (!tag_format.validity.RowIsValid(tag_idx)) {
 			FlatVector::SetNull(result, i, true);
 			continue;
 		}
 
-		auto &member = UnionVector::GetMember(varchar_union, tags[i]);
+		auto tag = UnifiedVectorFormat::GetData<union_tag_t>(tag_format)[tag_idx];
+		auto &member = UnionVector::GetMember(varchar_union, tag);
 		UnifiedVectorFormat member_vdata;
 		member.ToUnifiedFormat(count, member_vdata);
-
 		auto mapped_idx = member_vdata.sel->get_index(i);
 		auto member_valid = member_vdata.validity.RowIsValid(mapped_idx);
 		if (member_valid) {

package/src/duckdb/src/function/cast/vector_cast_helpers.cpp

@@ -336,7 +336,7 @@ bool VectorStringToStruct::SplitStruct(const string_t &input, vector<unique_ptr<
 				// empty key name unsupported
 				return false;
 			}
-			string_t found_key(buf + key_start, key_end - key_start);
+			string_t found_key(buf + key_start, UnsafeNumericCast<uint32_t>(key_end - key_start));
 
 			auto it = child_names.find(found_key);
 			if (it == child_names.end()) {

package/src/duckdb/src/function/cast_rules.cpp

@@ -1,4 +1,5 @@
 #include "duckdb/function/cast_rules.hpp"
+#include "duckdb/common/numeric_utils.hpp"
 
 namespace duckdb {
 
@@ -410,7 +411,7 @@ int64_t CastRules::ImplicitCast(const LogicalType &from, const LogicalType &to)
 					auto &from_member_type = UnionType::GetMemberType(from, from_member_idx);
 					auto &to_member_type = UnionType::GetMemberType(to, to_member_idx);
 
-					int child_cost = ImplicitCast(from_member_type, to_member_type);
+					int child_cost = NumericCast<int>(ImplicitCast(from_member_type, to_member_type));
 					if (child_cost > cost) {
 						cost = child_cost;
 					}

package/src/duckdb/src/function/pragma/ub_duckdb_func_pragma.cpp

@@ -0,0 +1,3 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/function/pragma/pragma_functions.cpp>
+#include </Users/carlo/duckdb/src/function/pragma/pragma_queries.cpp>

package/src/duckdb/src/function/scalar/bit/ub_duckdb_func_bit.cpp

@@ -0,0 +1,2 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/function/scalar/bit/bitstring.cpp>

package/src/duckdb/src/function/scalar/blob/ub_duckdb_func_blob.cpp

@@ -0,0 +1,3 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/function/scalar/blob/encode.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/blob/base64.cpp>

package/src/duckdb/src/function/scalar/compressed_materialization/compress_integral.cpp

@@ -1,7 +1,8 @@
-#include "duckdb/function/function_set.hpp"
-#include "duckdb/function/scalar/compressed_materialization_functions.hpp"
+#include "duckdb/common/numeric_utils.hpp"
 #include "duckdb/common/serializer/serializer.hpp"
 #include "duckdb/common/serializer/deserializer.hpp"
+#include "duckdb/function/function_set.hpp"
+#include "duckdb/function/scalar/compressed_materialization_functions.hpp"
 
 namespace duckdb {
 
@@ -14,7 +15,7 @@ template <class INPUT_TYPE, class RESULT_TYPE>
 struct TemplatedIntegralCompress {
 	static inline RESULT_TYPE Operation(const INPUT_TYPE &input, const INPUT_TYPE &min_val) {
 		D_ASSERT(min_val <= input);
-		return input - min_val;
+		return UnsafeNumericCast<RESULT_TYPE>(input - min_val);
 	}
 };
 
@@ -22,7 +23,7 @@ template <class RESULT_TYPE>
 struct TemplatedIntegralCompress<hugeint_t, RESULT_TYPE> {
 	static inline RESULT_TYPE Operation(const hugeint_t &input, const hugeint_t &min_val) {
 		D_ASSERT(min_val <= input);
-		return (input - min_val).lower;
+		return UnsafeNumericCast<RESULT_TYPE>((input - min_val).lower);
 	}
 };
 
@@ -30,7 +31,7 @@ template <class RESULT_TYPE>
 struct TemplatedIntegralCompress<uhugeint_t, RESULT_TYPE> {
 	static inline RESULT_TYPE Operation(const uhugeint_t &input, const uhugeint_t &min_val) {
 		D_ASSERT(min_val <= input);
-		return (input - min_val).lower;
+		return UnsafeNumericCast<RESULT_TYPE>((input - min_val).lower);
 	}
 };
 
@@ -97,7 +98,7 @@ static string IntegralDecompressFunctionName(const LogicalType &result_type) {
 
 template <class INPUT_TYPE, class RESULT_TYPE>
 static inline RESULT_TYPE TemplatedIntegralDecompress(const INPUT_TYPE &input, const RESULT_TYPE &min_val) {
-	return min_val + input;
+	return UnsafeNumericCast<RESULT_TYPE>(min_val + input);
 }
 
 template <class INPUT_TYPE, class RESULT_TYPE>

package/src/duckdb/src/function/scalar/compressed_materialization/compress_string.cpp

@@ -39,7 +39,7 @@ static inline RESULT_TYPE StringCompressInternal(const string_t &input) {
 		ReverseMemCpy(result_ptr + remainder, data_ptr_cast(input.GetPointer()), input.GetSize());
 		memset(result_ptr, '\0', remainder);
 	}
-	result_ptr[0] = input.GetSize();
+	result_ptr[0] = UnsafeNumericCast<char>(input.GetSize());
 	return result;
 }
 
@@ -52,11 +52,11 @@ static inline RESULT_TYPE StringCompress(const string_t &input) {
 template <class RESULT_TYPE>
 static inline RESULT_TYPE MiniStringCompress(const string_t &input) {
 	if (sizeof(RESULT_TYPE) <= string_t::INLINE_LENGTH) {
-		return input.GetSize() + *const_data_ptr_cast(input.GetPrefix());
+		return UnsafeNumericCast<RESULT_TYPE>(input.GetSize() + *const_data_ptr_cast(input.GetPrefix()));
 	} else if (input.GetSize() == 0) {
 		return 0;
 	} else {
-		return input.GetSize() + *const_data_ptr_cast(input.GetPointer());
+		return UnsafeNumericCast<RESULT_TYPE>(input.GetSize() + *const_data_ptr_cast(input.GetPointer()));
 	}
 }
 

package/src/duckdb/src/function/scalar/compressed_materialization/ub_duckdb_func_compressed_materialization.cpp

@@ -0,0 +1,3 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/function/scalar/compressed_materialization/compress_integral.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/compressed_materialization/compress_string.cpp>

package/src/duckdb/src/function/scalar/date/ub_duckdb_func_date.cpp

@@ -0,0 +1,12 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/function/scalar/date/age.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/date/current.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/date/epoch.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/date/date_diff.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/date/date_part.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/date/date_sub.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/date/date_trunc.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/date/make_date.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/date/strftime.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/date/time_bucket.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/date/to_interval.cpp>

package/src/duckdb/src/function/scalar/enum/ub_duckdb_func_enum.cpp

@@ -0,0 +1,2 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/function/scalar/enum/enum_functions_implementation.cpp>

package/src/duckdb/src/function/scalar/generic/ub_duckdb_func_generic.cpp

@@ -0,0 +1,8 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/function/scalar/generic/alias.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/generic/constant_or_null.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/generic/current_setting.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/generic/hash.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/generic/least.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/generic/stats.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/generic/typeof.cpp>

package/src/duckdb/src/function/scalar/generic/ub_duckdb_func_generic_main.cpp

@@ -0,0 +1,2 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/function/scalar/generic/constant_or_null.cpp>

package/src/duckdb/src/function/scalar/list/list_resize.cpp

@@ -9,7 +9,8 @@ namespace duckdb {
 void ListResizeFunction(DataChunk &args, ExpressionState &state, Vector &result) {
 	D_ASSERT(args.data[1].GetType().id() == LogicalTypeId::UBIGINT);
 	if (result.GetType().id() == LogicalTypeId::SQLNULL) {
-		FlatVector::SetNull(result, 0, true);
+		result.SetVectorType(VectorType::CONSTANT_VECTOR);
+		ConstantVector::SetNull(result, true);
 		return;
 	}
 	D_ASSERT(result.GetType().id() == LogicalTypeId::LIST);
@@ -46,6 +47,7 @@ void ListResizeFunction(DataChunk &args, ExpressionState &state, Vector &result)
 	optional_ptr<Vector> default_vector;
 	if (args.ColumnCount() == 3) {
 		default_vector = &args.data[2];
+		default_vector->Flatten(count);
 		default_vector->ToUnifiedFormat(count, default_data);
 		default_vector->SetVectorType(VectorType::CONSTANT_VECTOR);
 	}

package/src/duckdb/src/function/scalar/list/list_zip.cpp

@@ -22,10 +22,9 @@ static void ListZipFunction(DataChunk &args, ExpressionState &state, Vector &res
 	}
 
 	vector<UnifiedVectorFormat> input_lists;
+	input_lists.resize(args.ColumnCount());
 	for (idx_t i = 0; i < args.ColumnCount(); i++) {
-		UnifiedVectorFormat curr;
-		args.data[i].ToUnifiedFormat(count, curr);
-		input_lists.push_back(curr);
+		args.data[i].ToUnifiedFormat(count, input_lists[i]);
 	}
 
 	// Handling output row for each input row
@@ -77,7 +76,7 @@ static void ListZipFunction(DataChunk &args, ExpressionState &state, Vector &res
 	for (idx_t j = 0; j < count; j++) {
 		idx_t len = lengths[j];
 		for (idx_t i = 0; i < args_size; i++) {
-			UnifiedVectorFormat curr = input_lists[i];
+			auto &curr = input_lists[i];
 			idx_t sel_idx = curr.sel->get_index(j);
 			idx_t curr_off = 0;
 			idx_t curr_len = 0;

package/src/duckdb/src/function/scalar/list/ub_duckdb_func_list.cpp

@@ -0,0 +1,11 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/function/scalar/list/list_lambdas.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/list/list_concat.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/list/contains_or_position.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/list/list_aggregates.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/list/array_slice.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/list/list_extract.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/list/list_sort.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/list/list_value.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/list/range.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/list/flatten.cpp>

package/src/duckdb/src/function/scalar/list/ub_duckdb_func_list_nested.cpp

@@ -0,0 +1,5 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/function/scalar/list/list_concat.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/list/contains_or_position.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/list/list_extract.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/list/list_resize.cpp>

package/src/duckdb/src/function/scalar/map/ub_duckdb_func_map_nested.cpp

@@ -0,0 +1,7 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/function/scalar/map/map.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/map/map_extract.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/map/map_from_entries.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/map/map_entries.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/map/map_keys_values.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/map/cardinality.cpp>

package/src/duckdb/src/function/scalar/math/ub_duckdb_func_math.cpp

@@ -0,0 +1,4 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/function/scalar/math/numeric.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/math/random.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/math/setseed.cpp>

package/src/duckdb/src/function/scalar/nested_functions.cpp

@@ -14,9 +14,6 @@ void MapUtil::ReinterpretMap(Vector &result, Vector &input, idx_t count) {
 	auto &result_struct = ListVector::GetEntry(result);
 	FlatVector::SetValidity(result_struct, input_struct_data.validity);
 
-	// Set the right vector type
-	result.SetVectorType(input.GetVectorType());
-
 	// Copy the list size
 	auto list_size = ListVector::GetListSize(input);
 	ListVector::SetListSize(result, list_size);
@@ -31,6 +28,13 @@ void MapUtil::ReinterpretMap(Vector &result, Vector &input, idx_t count) {
 	auto &input_values = MapVector::GetValues(input);
 	auto &result_values = MapVector::GetValues(result);
 	result_values.Reference(input_values);
+
+	if (input.GetVectorType() == VectorType::DICTIONARY_VECTOR) {
+		result.Slice(*input_data.sel, count);
+	}
+
+	// Set the right vector type
+	result.SetVectorType(input.GetVectorType());
 }
 
 void BuiltinFunctions::RegisterNestedFunctions() {

package/src/duckdb/src/function/scalar/operators/arithmetic.cpp

@@ -205,7 +205,7 @@ unique_ptr<FunctionData> BindDecimalAddSubtract(ClientContext &context, ScalarFu
 	}
 	D_ASSERT(max_width > 0);
 	// for addition/subtraction, we add 1 to the width to ensure we don't overflow
-	auto required_width = MaxValue<uint8_t>(max_scale + max_width_over_scale, max_width) + 1;
+	auto required_width = NumericCast<uint8_t>(MaxValue<uint8_t>(max_scale + max_width_over_scale, max_width) + 1);
 	if (required_width > Decimal::MAX_WIDTH_INT64 && max_width <= Decimal::MAX_WIDTH_INT64) {
 		// we don't automatically promote past the hugeint boundary to avoid the large hugeint performance penalty
 		bind_data->check_overflow = true;

package/src/duckdb/src/function/scalar/operators/multiply.cpp

@@ -1,6 +1,7 @@
 #include "duckdb/common/operator/multiply.hpp"
 
 #include "duckdb/common/limits.hpp"
+#include "duckdb/common/operator/cast_operators.hpp"
 #include "duckdb/common/types/hugeint.hpp"
 #include "duckdb/common/types/uhugeint.hpp"
 #include "duckdb/common/types/value.hpp"
@@ -28,8 +29,9 @@ double MultiplyOperator::Operation(double left, double right) {
 
 template <>
 interval_t MultiplyOperator::Operation(interval_t left, int64_t right) {
-	left.months = MultiplyOperatorOverflowCheck::Operation<int32_t, int32_t, int32_t>(left.months, right);
-	left.days = MultiplyOperatorOverflowCheck::Operation<int32_t, int32_t, int32_t>(left.days, right);
+	const auto right32 = Cast::Operation<int64_t, int32_t>(right);
+	left.months = MultiplyOperatorOverflowCheck::Operation<int32_t, int32_t, int32_t>(left.months, right32);
+	left.days = MultiplyOperatorOverflowCheck::Operation<int32_t, int32_t, int32_t>(left.days, right32);
 	left.micros = MultiplyOperatorOverflowCheck::Operation<int64_t, int64_t, int64_t>(left.micros, right);
 	return left;
 }

package/src/duckdb/src/function/scalar/operators/subtract.cpp

@@ -50,9 +50,15 @@ date_t SubtractOperator::Operation(date_t left, int32_t right) {
 template <>
 interval_t SubtractOperator::Operation(interval_t left, interval_t right) {
 	interval_t result;
-	result.months = left.months - right.months;
-	result.days = left.days - right.days;
-	result.micros = left.micros - right.micros;
+	if (!TrySubtractOperator::Operation(left.months, right.months, result.months)) {
+		throw OutOfRangeException("Interval months subtraction out of range");
+	}
+	if (!TrySubtractOperator::Operation(left.days, right.days, result.days)) {
+		throw OutOfRangeException("Interval days subtraction out of range");
+	}
+	if (!TrySubtractOperator::Operation(left.micros, right.micros, result.micros)) {
+		throw OutOfRangeException("Interval micros subtraction out of range");
+	}
 	return result;
 }
 

package/src/duckdb/src/function/scalar/operators/ub_duckdb_func_ops.cpp

@@ -0,0 +1,6 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/function/scalar/operators/add.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/operators/arithmetic.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/operators/bitwise.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/operators/multiply.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/operators/subtract.cpp>

package/src/duckdb/src/function/scalar/operators/ub_duckdb_func_ops_main.cpp

@@ -0,0 +1,5 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/function/scalar/operators/add.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/operators/arithmetic.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/operators/multiply.cpp>
+#include </Users/carlo/duckdb/src/function/scalar/operators/subtract.cpp>

package/src/duckdb/src/function/scalar/sequence/ub_duckdb_func_seq.cpp

@@ -0,0 +1,2 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/function/scalar/sequence/nextval.cpp>

package/src/duckdb/src/function/scalar/strftime_format.cpp

@@ -367,7 +367,7 @@ char *StrfTimeFormat::WriteStandardSpecifier(StrTimeSpecifier specifier, int32_t
 		break;
 	}
 	case StrTimeSpecifier::MONTH_DECIMAL: {
-		target = Write2(target, data[1]);
+		target = Write2(target, UnsafeNumericCast<uint8_t>(data[1]));
 		break;
 	}
 	case StrTimeSpecifier::YEAR_WITHOUT_CENTURY: {
@@ -375,7 +375,7 @@ char *StrfTimeFormat::WriteStandardSpecifier(StrTimeSpecifier specifier, int32_t
 		break;
 	}
 	case StrTimeSpecifier::HOUR_24_DECIMAL: {
-		target = Write2(target, data[3]);
+		target = Write2(target, UnsafeNumericCast<uint8_t>(data[3]));
 		break;
 	}
 	case StrTimeSpecifier::HOUR_12_DECIMAL: {
@@ -383,15 +383,15 @@ char *StrfTimeFormat::WriteStandardSpecifier(StrTimeSpecifier specifier, int32_t
 		if (hour == 0) {
 			hour = 12;
 		}
-		target = Write2(target, hour);
+		target = Write2(target, UnsafeNumericCast<uint8_t>(hour));
 		break;
 	}
 	case StrTimeSpecifier::MINUTE_DECIMAL: {
-		target = Write2(target, data[4]);
+		target = Write2(target, UnsafeNumericCast<uint8_t>(data[4]));
 		break;
 	}
 	case StrTimeSpecifier::SECOND_DECIMAL: {
-		target = Write2(target, data[5]);
+		target = Write2(target, UnsafeNumericCast<uint8_t>(data[5]));
 		break;
 	}
 	default:
@@ -731,7 +731,7 @@ int32_t StrpTimeFormat::TryParseCollection(const char *data, idx_t &pos, idx_t s
 		if (i == entry_size) {
 			// full match
 			pos += entry_size;
-			return c;
+			return UnsafeNumericCast<int32_t>(c);
 		}
 	}
 	return -1;
@@ -862,7 +862,7 @@ bool StrpTimeFormat::Parse(string_t str, ParseResult &result) const {
 					return false;
 				}
 				// day of the month
-				result_data[2] = number;
+				result_data[2] = UnsafeNumericCast<int32_t>(number);
 				offset_specifier = specifiers[i];
 				break;
 			case StrTimeSpecifier::MONTH_DECIMAL_PADDED:
@@ -873,7 +873,7 @@ bool StrpTimeFormat::Parse(string_t str, ParseResult &result) const {
 					return false;
 				}
 				// month number
-				result_data[1] = number;
+				result_data[1] = UnsafeNumericCast<int32_t>(number);
 				offset_specifier = specifiers[i];
 				break;
 			case StrTimeSpecifier::YEAR_WITHOUT_CENTURY_PADDED:
@@ -916,7 +916,7 @@ bool StrpTimeFormat::Parse(string_t str, ParseResult &result) const {
 					break;
 				}
 				// year as full number
-				result_data[0] = number;
+				result_data[0] = UnsafeNumericCast<int32_t>(number);
 				break;
 			case StrTimeSpecifier::YEAR_ISO:
 				switch (offset_specifier) {
@@ -965,7 +965,7 @@ bool StrpTimeFormat::Parse(string_t str, ParseResult &result) const {
 					return false;
 				}
 				// hour as full number
-				result_data[3] = number;
+				result_data[3] = UnsafeNumericCast<int32_t>(number);
 				break;
 			case StrTimeSpecifier::HOUR_12_PADDED:
 			case StrTimeSpecifier::HOUR_12_DECIMAL:
@@ -975,7 +975,7 @@ bool StrpTimeFormat::Parse(string_t str, ParseResult &result) const {
 					return false;
 				}
 				// 12-hour number: start off by just storing the number
-				result_data[3] = number;
+				result_data[3] = UnsafeNumericCast<int32_t>(number);
 				break;
 			case StrTimeSpecifier::MINUTE_PADDED:
 			case StrTimeSpecifier::MINUTE_DECIMAL:
@@ -985,7 +985,7 @@ bool StrpTimeFormat::Parse(string_t str, ParseResult &result) const {
 					return false;
 				}
 				// minutes
-				result_data[4] = number;
+				result_data[4] = UnsafeNumericCast<int32_t>(number);
 				break;
 			case StrTimeSpecifier::SECOND_PADDED:
 			case StrTimeSpecifier::SECOND_DECIMAL:
@@ -995,22 +995,23 @@ bool StrpTimeFormat::Parse(string_t str, ParseResult &result) const {
 					return false;
 				}
 				// seconds
-				result_data[5] = number;
+				result_data[5] = UnsafeNumericCast<int32_t>(number);
 				break;
 			case StrTimeSpecifier::NANOSECOND_PADDED:
 				D_ASSERT(number < Interval::NANOS_PER_SEC); // enforced by the length of the number
 				// microseconds (rounded)
-				result_data[6] = (number + Interval::NANOS_PER_MICRO / 2) / Interval::NANOS_PER_MICRO;
+				result_data[6] =
+				    UnsafeNumericCast<int32_t>((number + Interval::NANOS_PER_MICRO / 2) / Interval::NANOS_PER_MICRO);
 				break;
 			case StrTimeSpecifier::MICROSECOND_PADDED:
 				D_ASSERT(number < Interval::MICROS_PER_SEC); // enforced by the length of the number
 				// microseconds
-				result_data[6] = number;
+				result_data[6] = UnsafeNumericCast<int32_t>(number);
 				break;
 			case StrTimeSpecifier::MILLISECOND_PADDED:
 				D_ASSERT(number < Interval::MSECS_PER_SEC); // enforced by the length of the number
 				// microseconds
-				result_data[6] = number * Interval::MICROS_PER_MSEC;
+				result_data[6] = UnsafeNumericCast<int32_t>(number * Interval::MICROS_PER_MSEC);
 				break;
 			case StrTimeSpecifier::WEEK_NUMBER_PADDED_SUN_FIRST:
 			case StrTimeSpecifier::WEEK_NUMBER_PADDED_MON_FIRST:
@@ -1272,11 +1273,11 @@ bool StrpTimeFormat::Parse(string_t str, ParseResult &result) const {
 		iso_week = (iso_week > 53) ? 1 : iso_week;
 		iso_weekday = (iso_weekday > 7) ? 1 : iso_weekday;
 		// Gregorian and ISO agree on the year of January 4
-		auto jan4 = Date::FromDate(iso_year, 1, 4);
+		auto jan4 = Date::FromDate(UnsafeNumericCast<int32_t>(iso_year), 1, 4);
 		// ISO Week 1 starts on the previous Monday
 		auto week1 = Date::GetMondayOfCurrentWeek(jan4);
 		// ISO Week N starts N-1 weeks later
-		auto iso_date = week1 + (iso_week - 1) * 7 + (iso_weekday - 1);
+		auto iso_date = week1 + UnsafeNumericCast<int32_t>((iso_week - 1) * 7 + (iso_weekday - 1));
 		Date::Convert(iso_date, result_data[0], result_data[1], result_data[2]);
 		break;
 	}
@@ -1292,14 +1293,14 @@ bool StrpTimeFormat::Parse(string_t str, ParseResult &result) const {
 		yeardate -= int(offset_specifier == StrTimeSpecifier::WEEK_NUMBER_PADDED_SUN_FIRST);
 		// Is there a week 0?
 		yeardate -= 7 * int(yeardate >= jan1);
-		yeardate += weekno * 7 + weekday;
+		yeardate += UnsafeNumericCast<int32_t>(weekno * 7 + weekday);
 		Date::Convert(yeardate, result_data[0], result_data[1], result_data[2]);
 		break;
 	}
 	case StrTimeSpecifier::DAY_OF_YEAR_PADDED:
 	case StrTimeSpecifier::DAY_OF_YEAR_DECIMAL: {
 		auto yeardate = Date::FromDate(result_data[0], 1, 1);
-		yeardate += yearday - 1;
+		yeardate += UnsafeNumericCast<int32_t>(yearday - 1);
 		Date::Convert(yeardate, result_data[0], result_data[1], result_data[2]);
 		break;
 	}