duckdb 0.3.5-dev113.0 → 0.3.5-dev123.0

package/package.json

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

package/src/duckdb.cpp

@@ -46772,8 +46772,8 @@ static bool ListCastSwitch(Vector &source, Vector &result, idx_t count, string *
 }
 
 template <class SRC_TYPE, class RES_TYPE>
-void FillEnum(Vector &source, Vector &result, idx_t count) {
-
+bool FillEnum(Vector &source, Vector &result, idx_t count, string *error_message) {
+	bool all_converted = true;
 	result.SetVectorType(VectorType::FLAT_VECTOR);
 
 	auto &str_vec = EnumType::GetValuesInsertOrder(source.GetType());
@@ -46801,25 +46801,29 @@ void FillEnum(Vector &source, Vector &result, idx_t count) {
 		auto key = EnumType::GetPos(res_enum_type, str);
 		if (key == -1) {
 			// key doesn't exist on result enum
-			result_mask.SetInvalid(i);
+			if (!error_message) {
+				result_data[i] = HandleVectorCastError::Operation<RES_TYPE>(
+				    CastExceptionText<SRC_TYPE, RES_TYPE>(source_data[src_idx]), result_mask, i, error_message,
+				    all_converted);
+			} else {
+				result_mask.SetInvalid(i);
+			}
 			continue;
 		}
 		result_data[i] = key;
 	}
+	return all_converted;
 }
 
 template <class SRC_TYPE>
-void FillEnumResultTemplate(Vector &source, Vector &result, idx_t count) {
+bool FillEnumResultTemplate(Vector &source, Vector &result, idx_t count, string *error_message) {
 	switch (source.GetType().InternalType()) {
 	case PhysicalType::UINT8:
-		FillEnum<SRC_TYPE, uint8_t>(source, result, count);
-		break;
+		return FillEnum<SRC_TYPE, uint8_t>(source, result, count, error_message);
 	case PhysicalType::UINT16:
-		FillEnum<SRC_TYPE, uint16_t>(source, result, count);
-		break;
+		return FillEnum<SRC_TYPE, uint16_t>(source, result, count, error_message);
 	case PhysicalType::UINT32:
-		FillEnum<SRC_TYPE, uint32_t>(source, result, count);
-		break;
+		return FillEnum<SRC_TYPE, uint32_t>(source, result, count, error_message);
 	default:
 		throw InternalException("ENUM can only have unsigned integers (except UINT64) as physical types");
 	}
@@ -46867,18 +46871,14 @@ static bool EnumCastSwitch(Vector &source, Vector &result, idx_t count, string *
 		// This means they are both ENUMs, but of different types.
 		switch (enum_physical_type) {
 		case PhysicalType::UINT8:
-			FillEnumResultTemplate<uint8_t>(source, result, count);
-			break;
+			return FillEnumResultTemplate<uint8_t>(source, result, count, error_message);
 		case PhysicalType::UINT16:
-			FillEnumResultTemplate<uint16_t>(source, result, count);
-			break;
+			return FillEnumResultTemplate<uint16_t>(source, result, count, error_message);
 		case PhysicalType::UINT32:
-			FillEnumResultTemplate<uint32_t>(source, result, count);
-			break;
+			return FillEnumResultTemplate<uint32_t>(source, result, count, error_message);
 		default:
 			throw InternalException("ENUM can only have unsigned integers (except UINT64) as physical types");
 		}
-		break;
 	}
 	case LogicalTypeId::JSON:
 	case LogicalTypeId::VARCHAR: {
@@ -129685,7 +129685,7 @@ unique_ptr<Expression> EnumComparisonRule::Apply(LogicalOperator &op, vector<Exp
 	}
 
 	auto cast_left_to_right =
-	    make_unique<BoundCastExpression>(move(left_child->child), right_child->child->return_type);
+	    make_unique<BoundCastExpression>(move(left_child->child), right_child->child->return_type, true);
 
 	return make_unique<BoundComparisonExpression>(root->type, move(cast_left_to_right), move(right_child->child));
 }

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 "4048fca78"
-#define DUCKDB_VERSION "v0.3.5-dev113"
+#define DUCKDB_SOURCE_ID "6d4e7c7f6"
+#define DUCKDB_VERSION "v0.3.5-dev123"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //