duckdb 0.5.2-dev648.0 → 0.5.2-dev656.0

package/package.json

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

package/src/duckdb.cpp

@@ -66815,6 +66815,8 @@ public:
 	DUCKDB_API void Bind(vector<Value> values);
 	//! Get the expected SQL Type of the bound parameter
 	DUCKDB_API LogicalType GetType(idx_t param_index);
+	//! Try to get the expected SQL Type of the bound parameter
+	DUCKDB_API bool TryGetType(idx_t param_idx, LogicalType &result);
 };
 
 } // namespace duckdb
@@ -77451,6 +77453,9 @@ bool BufferedCSVReader::AddRow(DataChunk &insert_chunk, idx_t &column) {
 	if (row_empty) {
 		row_empty = false;
 		if (sql_types.size() != 1) {
+			if (mode == ParserMode::PARSING) {
+				FlatVector::SetNull(parse_chunk.data[0], parse_chunk.size(), false);
+			}
 			column = 0;
 			return false;
 		}
@@ -126192,6 +126197,7 @@ using duckdb::Connection;
 using duckdb::date_t;
 using duckdb::dtime_t;
 using duckdb::hugeint_t;
+using duckdb::LogicalType;
 using duckdb::MaterializedQueryResult;
 using duckdb::PreparedStatementWrapper;
 using duckdb::QueryResultType;
@@ -126231,11 +126237,11 @@ duckdb_type duckdb_param_type(duckdb_prepared_statement prepared_statement, idx_
 	if (!wrapper || !wrapper->statement || wrapper->statement->HasError()) {
 		return DUCKDB_TYPE_INVALID;
 	}
-	auto entry = wrapper->statement->data->value_map.find(param_idx);
-	if (entry == wrapper->statement->data->value_map.end()) {
+	LogicalType param_type;
+	if (!wrapper->statement->data->TryGetType(param_idx, param_type)) {
 		return DUCKDB_TYPE_INVALID;
 	}
-	return ConvertCPPTypeToC(entry->second->return_type);
+	return ConvertCPPTypeToC(param_type);
 }
 
 duckdb_state duckdb_clear_bindings(duckdb_prepared_statement prepared_statement) {
@@ -140402,12 +140408,25 @@ void PreparedStatementData::Bind(vector<Value> values) {
 	}
 }
 
-LogicalType PreparedStatementData::GetType(idx_t param_idx) {
+bool PreparedStatementData::TryGetType(idx_t param_idx, LogicalType &result) {
 	auto it = value_map.find(param_idx);
 	if (it == value_map.end()) {
+		return false;
+	}
+	if (it->second->return_type.id() != LogicalTypeId::INVALID) {
+		result = it->second->return_type;
+	} else {
+		result = it->second->value.type();
+	}
+	return true;
+}
+
+LogicalType PreparedStatementData::GetType(idx_t param_idx) {
+	LogicalType result;
+	if (!TryGetType(param_idx, result)) {
 		throw BinderException("Could not find parameter with index %llu", param_idx);
 	}
-	return it->second->return_type;
+	return result;
 }
 
 } // namespace duckdb
@@ -148719,6 +148738,9 @@ unique_ptr<JoinNode> JoinOrderOptimizer::CreateJoinTree(JoinRelationSet *set,
 		return CreateJoinTree(set, possible_connections, right, left);
 	}
 	if (plan != plans.end()) {
+		if (!plan->second) {
+			throw InternalException("No plan: internal error in join order optimizer");
+		}
 		expected_cardinality = plan->second->GetCardinality();
 		best_connection = possible_connections.back();
 	} else if (possible_connections.empty()) {
@@ -148755,6 +148777,9 @@ JoinNode *JoinOrderOptimizer::EmitPair(JoinRelationSet *left, JoinRelationSet *r
 	// get the left and right join plans
 	auto &left_plan = plans[left];
 	auto &right_plan = plans[right];
+	if (!left_plan || !right_plan) {
+		throw InternalException("No left or right plan: internal error in join order optimizer");
+	}
 	auto new_set = set_manager.Union(left, right);
 	// create the join tree based on combining the two plans
 	auto new_plan = CreateJoinTree(new_set, info, left_plan.get(), right_plan.get());
@@ -148787,6 +148812,7 @@ JoinNode *JoinOrderOptimizer::EmitPair(JoinRelationSet *left, JoinRelationSet *r
 			}
 		}
 
+		D_ASSERT(new_plan);
 		plans[new_set] = move(new_plan);
 		return result;
 	}
@@ -149437,6 +149463,7 @@ unique_ptr<LogicalOperator> JoinOrderOptimizer::Optimize(unique_ptr<LogicalOpera
 	cardinality_estimator.InitCardinalityEstimatorProps(&nodes_ops, &filter_infos);
 
 	for (auto &node_op : nodes_ops) {
+		D_ASSERT(node_op.node);
 		plans[node_op.node->set] = move(node_op.node);
 	}
 	// now we perform the actual dynamic programming to compute the final result

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 "b5b1b7fbe"
-#define DUCKDB_VERSION "v0.5.2-dev648"
+#define DUCKDB_SOURCE_ID "673868e0d"
+#define DUCKDB_VERSION "v0.5.2-dev656"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //