duckdb 0.4.1-dev333.0 → 0.4.1-dev347.0

package/package.json

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

package/src/duckdb.cpp

@@ -1537,7 +1537,7 @@ public:
 	}
 
 	template <class T, class RETURN_TYPE = unique_ptr<T>, typename... ARGS>
-	RETURN_TYPE ReadSerializable(RETURN_TYPE default_value, ARGS &&... args) {
+	RETURN_TYPE ReadSerializable(RETURN_TYPE default_value, ARGS &&...args) {
 		if (field_count >= max_field_count) {
 			// field is not there, read the default value
 			return default_value;
@@ -1559,7 +1559,7 @@ public:
 	}
 
 	template <class T, class RETURN_TYPE = unique_ptr<T>, typename... ARGS>
-	RETURN_TYPE ReadRequiredSerializable(ARGS &&... args) {
+	RETURN_TYPE ReadRequiredSerializable(ARGS &&...args) {
 		if (field_count >= max_field_count) {
 			// field is not there, read the default value
 			throw SerializationException("Attempting to read mandatory field, but field is missing");
@@ -60105,14 +60105,21 @@ public:
 	StreamingWindowState() : initialized(false) {
 	}
 
-	void Initialize(DataChunk &input, const vector<unique_ptr<Expression>> &expressions) {
+	void Initialize(Allocator &allocator, DataChunk &input, const vector<unique_ptr<Expression>> &expressions) {
 		for (idx_t expr_idx = 0; expr_idx < expressions.size(); expr_idx++) {
 			auto &expr = *expressions[expr_idx];
 			switch (expr.GetExpressionType()) {
 			case ExpressionType::WINDOW_FIRST_VALUE: {
 				auto &wexpr = (BoundWindowExpression &)expr;
-				auto &ref = (BoundReferenceExpression &)*wexpr.children[0];
-				const_vectors.push_back(make_unique<Vector>(input.data[ref.index].GetValue(0)));
+
+				// Just execute the expression once
+				ExpressionExecutor executor(allocator);
+				executor.AddExpression(*wexpr.children[0]);
+				DataChunk result;
+				result.Initialize(allocator, {wexpr.children[0]->return_type});
+				executor.Execute(input, result);
+
+				const_vectors.push_back(make_unique<Vector>(result.GetValue(0, 0)));
 				break;
 			}
 			case ExpressionType::WINDOW_PERCENT_RANK: {
@@ -60149,7 +60156,8 @@ OperatorResultType PhysicalStreamingWindow::Execute(ExecutionContext &context, D
 	auto &gstate = (StreamingWindowGlobalState &)gstate_p;
 	auto &state = (StreamingWindowState &)state_p;
 	if (!state.initialized) {
-		state.Initialize(input, select_list);
+		auto &allocator = Allocator::Get(context.client);
+		state.Initialize(allocator, input, select_list);
 	}
 	// Put payload columns in place
 	for (idx_t col_idx = 0; col_idx < input.data.size(); col_idx++) {
@@ -121066,7 +121074,7 @@ inline std::string encode_url(const std::string &s) {
 	for (size_t i = 0; s[i]; i++) {
 		switch (s[i]) {
 		case ' ': result += "%20"; break;
-		case '+': result += "%2B"; break;
+//		case '+': result += "%2B"; break;
 		case '\r': result += "%0D"; break;
 		case '\n': result += "%0A"; break;
 		case '\'': result += "%27"; break;
@@ -121112,7 +121120,12 @@ inline std::string decode_url(const std::string &s,
 				int val = 0;
 				if (from_hex_to_i(s, i + 1, 2, val)) {
 					// 2 digits hex codes
-					result += static_cast<char>(val);
+					if (static_cast<char>(val) == '+'){
+						// We don't decode +
+						result += "%2B";
+					} else {
+						result += static_cast<char>(val);
+					}
 					i += 2; // '00'
 				} else {
 					result += s[i];
@@ -122711,7 +122724,7 @@ inline void parse_query_text(const std::string &s, Params &params) {
 		});
 
 		if (!key.empty()) {
-			params.emplace(decode_url(key, true), decode_url(val, true));
+			params.emplace(decode_url(key, true), decode_url(val, false));
 		}
 	});
 }

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 "cdbc688c1"
-#define DUCKDB_VERSION "v0.4.1-dev333"
+#define DUCKDB_SOURCE_ID "81c2ea292"
+#define DUCKDB_VERSION "v0.4.1-dev347"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //