duckdb 0.4.1-dev1046.0 → 0.4.1-dev1053.0

package/package.json

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

package/src/duckdb.cpp

@@ -115515,6 +115515,15 @@ duckdb_type duckdb_param_type(duckdb_prepared_statement prepared_statement, idx_
 	return ConvertCPPTypeToC(entry->second->return_type);
 }
 
+duckdb_state duckdb_clear_bindings(duckdb_prepared_statement prepared_statement) {
+	auto wrapper = (PreparedStatementWrapper *)prepared_statement;
+	if (!wrapper || !wrapper->statement || !wrapper->statement->success) {
+		return DuckDBError;
+	}
+	wrapper->values.clear();
+	return DuckDBSuccess;
+}
+
 static duckdb_state duckdb_bind_value(duckdb_prepared_statement prepared_statement, idx_t param_idx, Value val) {
 	auto wrapper = (PreparedStatementWrapper *)prepared_statement;
 	if (!wrapper || !wrapper->statement || !wrapper->statement->success) {
@@ -165019,8 +165028,6 @@ unique_ptr<SQLStatement> Transformer::TransformStatementInternal(duckdb_libpgque
 
 
 
-
-
 #include <algorithm>
 
 namespace duckdb {
@@ -165362,16 +165369,45 @@ void BindContext::GenerateAllColumnExpressions(StarExpression &expr,
 		}
 	} else {
 		// SELECT tbl.* case
+		// SELECT struct.* case
 		string error;
 		auto binding = GetBinding(expr.relation_name, error);
+		bool is_struct_ref = false;
 		if (!binding) {
-			throw BinderException(error);
-		}
-		for (auto &column_name : binding->names) {
-			if (CheckExclusionList(expr, binding, column_name, new_select_list, excluded_columns)) {
-				continue;
+			auto binding_name = GetMatchingBinding(expr.relation_name);
+			if (binding_name.empty()) {
+				throw BinderException(error);
+			}
+			binding = bindings[binding_name].get();
+			is_struct_ref = true;
+		}
+
+		if (is_struct_ref) {
+			auto col_idx = binding->GetBindingIndex(expr.relation_name);
+			auto col_type = binding->types[col_idx];
+			if (col_type.id() != LogicalTypeId::STRUCT) {
+				throw BinderException(StringUtil::Format(
+				    "Cannot extract field from expression \"%s\" because it is not a struct", expr.ToString()));
+			}
+			auto &struct_children = StructType::GetChildTypes(col_type);
+			vector<string> column_names(3);
+			column_names[0] = binding->alias;
+			column_names[1] = expr.relation_name;
+			for (auto &child : struct_children) {
+				if (CheckExclusionList(expr, binding, child.first, new_select_list, excluded_columns)) {
+					continue;
+				}
+				column_names[2] = child.first;
+				new_select_list.push_back(make_unique<ColumnRefExpression>(column_names));
+			}
+		} else {
+			for (auto &column_name : binding->names) {
+				if (CheckExclusionList(expr, binding, column_name, new_select_list, excluded_columns)) {
+					continue;
+				}
+
+				new_select_list.push_back(make_unique<ColumnRefExpression>(column_name, binding->alias));
 			}
-			new_select_list.push_back(make_unique<ColumnRefExpression>(column_name, binding->alias));
 		}
 	}
 	for (auto &excluded : expr.exclude_list) {

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 "512009a16"
-#define DUCKDB_VERSION "v0.4.1-dev1046"
+#define DUCKDB_SOURCE_ID "a931db94d"
+#define DUCKDB_VERSION "v0.4.1-dev1053"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -16617,6 +16617,11 @@ Returns `DUCKDB_TYPE_INVALID` if the parameter index is out of range or the stat
 */
 DUCKDB_API duckdb_type duckdb_param_type(duckdb_prepared_statement prepared_statement, idx_t param_idx);
 
+/*!
+Clear the params bind to the prepared statement.
+*/
+DUCKDB_API duckdb_state duckdb_clear_bindings(duckdb_prepared_statement prepared_statement);
+
 /*!
 Binds a bool value to the prepared statement at the specified index.
 */