duckdb 0.3.2-dev337.0 → 0.3.2-dev345.0

package/package.json

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

package/src/duckdb.cpp

@@ -90022,6 +90022,8 @@ void InstrFun::RegisterFunction(BuiltinFunctions &set) {
 	set.AddFunction(instr);
 	instr.name = "strpos";
 	set.AddFunction(instr);
+	instr.name = "position";
+	set.AddFunction(instr);
 }
 
 } // namespace duckdb
@@ -117137,6 +117139,8 @@ struct CSEReplacementState {
 	column_binding_map_t<idx_t> column_map;
 	//! The set of expressions of the resulting projection
 	vector<unique_ptr<Expression>> expressions;
+	//! Cached expressions that are kept around so the expression_map always contains valid expressions
+	vector<unique_ptr<Expression>> cached_expressions;
 };
 
 void CommonSubExpressionOptimizer::VisitOperator(LogicalOperator &op) {
@@ -117212,6 +117216,8 @@ void CommonSubExpressionOptimizer::PerformCSEReplacement(unique_ptr<Expression>
 				// has not been pushed yet: push it
 				node.column_index = state.expressions.size();
 				state.expressions.push_back(move(*expr_ptr));
+			} else {
+				state.cached_expressions.push_back(move(*expr_ptr));
 			}
 			// replace the original expression with a bound column ref
 			*expr_ptr = make_unique<BoundColumnRefExpression>(alias, type,
@@ -147142,7 +147148,7 @@ BindResult ExpressionBinder::BindFunction(FunctionExpression &function, ScalarFu
 	unique_ptr<Expression> result =
 	    ScalarFunction::BindScalarFunction(context, *func, move(children), error, function.is_operator);
 	if (!result) {
-		throw BinderException(binder.FormatError(function, error));
+		return BindResult(binder.FormatError(function, error));
 	}
 	return BindResult(move(result));
 }

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 "c69ecbf73"
-#define DUCKDB_VERSION "0.3.2-dev337"
+#define DUCKDB_SOURCE_ID "89fff31ff"
+#define DUCKDB_VERSION "0.3.2-dev345"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //