duckdb 0.3.2-dev123.0 → 0.3.2-dev125.0

package/package.json

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

package/src/duckdb.cpp

@@ -92554,6 +92554,7 @@ public:
 } // namespace duckdb
 
 
+
 namespace duckdb {
 
 struct StructExtractBindData : public FunctionData {
@@ -92617,12 +92618,12 @@ static unique_ptr<FunctionData> StructExtractBind(ClientContext &context, Scalar
 
 	if (key_child->return_type.id() != LogicalTypeId::VARCHAR ||
 	    key_child->return_type.id() != LogicalTypeId::VARCHAR || !key_child->IsFoldable()) {
-		throw Exception("Key name for struct_extract needs to be a constant string");
+		throw BinderException("Key name for struct_extract needs to be a constant string");
 	}
 	Value key_val = ExpressionExecutor::EvaluateScalar(*key_child.get());
 	D_ASSERT(key_val.type().id() == LogicalTypeId::VARCHAR);
 	if (key_val.is_null || key_val.str_value.length() < 1) {
-		throw Exception("Key name for struct_extract needs to be neither NULL nor empty");
+		throw BinderException("Key name for struct_extract needs to be neither NULL nor empty");
 	}
 	string key = StringUtil::Lower(key_val.str_value);
 
@@ -92632,15 +92633,23 @@ static unique_ptr<FunctionData> StructExtractBind(ClientContext &context, Scalar
 
 	for (size_t i = 0; i < struct_children.size(); i++) {
 		auto &child = struct_children[i];
-		if (child.first == key) {
+		if (StringUtil::Lower(child.first) == key) {
 			found_key = true;
 			key_index = i;
 			return_type = child.second;
 			break;
 		}
 	}
+
 	if (!found_key) {
-		throw Exception("Could not find key in struct");
+		vector<string> candidates;
+		candidates.reserve(struct_children.size());
+		for (auto &struct_child : struct_children) {
+			candidates.push_back(struct_child.first);
+		}
+		auto closest_settings = StringUtil::TopNLevenshtein(candidates, key);
+		auto message = StringUtil::CandidatesMessage(closest_settings, "Candidate Entries");
+		throw BinderException("Could not find key \"%s\" in struct\n%s", key, message);
 	}
 
 	bound_function.return_type = return_type;
@@ -92707,7 +92716,7 @@ static void StructPackFunction(DataChunk &args, ExpressionState &state, Vector &
 
 static unique_ptr<FunctionData> StructPackBind(ClientContext &context, ScalarFunction &bound_function,
                                                vector<unique_ptr<Expression>> &arguments) {
-	unordered_set<string> name_collision_set;
+	case_insensitive_set_t name_collision_set;
 
 	// collect names and deconflict, construct return type
 	if (arguments.empty()) {

package/src/duckdb.hpp

@@ -10,8 +10,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 #pragma once
 #define DUCKDB_AMALGAMATION 1
-#define DUCKDB_SOURCE_ID "1e8295d66"
-#define DUCKDB_VERSION "0.3.2-dev123"
+#define DUCKDB_SOURCE_ID "a13ec3642"
+#define DUCKDB_VERSION "0.3.2-dev125"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //