duckdb 0.3.3-dev1422.0 → 0.3.3-dev1425.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "duckdb",
   "main": "./lib/duckdb.js",
-  "version": "0.3.3-dev1422.0",
+  "version": "0.3.3-dev1425.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/duckdb.cpp

@@ -129455,6 +129455,7 @@ unique_ptr<BaseStatistics> StatisticsPropagator::PropagateExpression(BoundAggreg
 
 
 
+
 namespace duckdb {
 
 unique_ptr<Expression> CastHugeintToSmallestType(unique_ptr<Expression> expr, NumericStatistics &num_stats) {
@@ -129517,23 +129518,21 @@ unique_ptr<Expression> TemplatedCastToSmallestType(unique_ptr<Expression> expr,
 		return expr;
 	}
 
-	// Prevent signed integer overflow - we can't range map these
-	if (std::is_signed<T>() && signed_min_val < -((T)1 << (sizeof(T) * 8 - 2)) &&
-	    signed_max_val > ((T)1 << (sizeof(T) * 8 - 2))) {
+	// Compute range, cast to unsigned to prevent comparing signed with unsigned
+	T signed_range;
+	if (!TrySubtractOperator::Operation(signed_min_val, signed_max_val, signed_range)) {
+		// overflow in subtraction: cannot do any simplification
 		return expr;
 	}
-
-	// Compute range, cast to unsigned to prevent comparing signed with unsigned
-	auto signed_range = signed_max_val - signed_min_val;
 	auto range = static_cast<typename std::make_unsigned<decltype(signed_range)>::type>(signed_range);
 
 	// Check if this range fits in a smaller type
 	LogicalType cast_type;
-	if (range < NumericLimits<uint8_t>().Maximum()) {
+	if (range < NumericLimits<uint8_t>::Maximum()) {
 		cast_type = LogicalType::UTINYINT;
-	} else if (sizeof(T) > sizeof(uint16_t) && range < NumericLimits<uint16_t>().Maximum()) {
+	} else if (sizeof(T) > sizeof(uint16_t) && range < NumericLimits<uint16_t>::Maximum()) {
 		cast_type = LogicalType::USMALLINT;
-	} else if (sizeof(T) > sizeof(uint32_t) && range < NumericLimits<uint32_t>().Maximum()) {
+	} else if (sizeof(T) > sizeof(uint32_t) && range < NumericLimits<uint32_t>::Maximum()) {
 		cast_type = LogicalType::UINTEGER;
 	} else {
 		return expr;

package/src/duckdb.hpp

@@ -11,8 +11,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #pragma once
 #define DUCKDB_AMALGAMATION 1
 #define DUCKDB_AMALGAMATION_EXTENDED 1
-#define DUCKDB_SOURCE_ID "f3371d736"
-#define DUCKDB_VERSION "v0.3.3-dev1422"
+#define DUCKDB_SOURCE_ID "f9fcdc7d0"
+#define DUCKDB_VERSION "v0.3.3-dev1425"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //