duckdb 0.5.2-dev648.0 → 0.5.2-dev650.0

package/package.json

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

package/src/duckdb.cpp

@@ -148719,6 +148719,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 +148758,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 +148793,7 @@ JoinNode *JoinOrderOptimizer::EmitPair(JoinRelationSet *left, JoinRelationSet *r
 			}
 		}
 
+		D_ASSERT(new_plan);
 		plans[new_set] = move(new_plan);
 		return result;
 	}
@@ -149437,6 +149444,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 "9b1e6ec64"
+#define DUCKDB_VERSION "v0.5.2-dev650"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //