duckdb 0.3.2-dev665.0 → 0.3.2-dev668.0

package/package.json

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

package/src/duckdb.cpp

@@ -145474,8 +145474,10 @@ BindResult ExpressionBinder::BindExpression(BetweenExpression &expr, idx_t depth
 		lower.expr = PushCollation(context, move(lower.expr), collation, false);
 		upper.expr = PushCollation(context, move(upper.expr), collation, false);
 	}
-	if (!input.expr->HasSideEffects() && !input.expr->HasParameter()) {
-		// the expression does not have side effects: create two comparisons
+	if (!input.expr->HasSideEffects() && !input.expr->HasParameter() && !input.expr->HasSubquery()) {
+		// the expression does not have side effects and can be copied: create two comparisons
+		// the reason we do this is that individual comparisons are easier to handle in optimizers
+		// if both comparisons remain they will be folded together again into a single BETWEEN in the optimizer
 		auto left_compare = make_unique<BoundComparisonExpression>(ExpressionType::COMPARE_GREATERTHANOREQUALTO,
 		                                                           input.expr->Copy(), move(lower.expr));
 		auto right_compare = make_unique<BoundComparisonExpression>(ExpressionType::COMPARE_LESSTHANOREQUALTO,

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 "dd2f405ae"
-#define DUCKDB_VERSION "0.3.2-dev665"
+#define DUCKDB_SOURCE_ID "a5e6d9bd4"
+#define DUCKDB_VERSION "0.3.2-dev668"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //