duckdb 0.5.2-dev2133.0 → 0.5.2-dev2157.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "duckdb",
   "main": "./lib/duckdb.js",
   "types": "./lib/duckdb.d.ts",
-  "version": "0.5.2-dev2133.0",
+  "version": "0.5.2-dev2157.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/duckdb.cpp

@@ -45450,6 +45450,7 @@ string Decimal::ToString(hugeint_t value, uint8_t width, uint8_t scale) {
 
 
 #include <functional>
+#include <cmath>
 
 namespace duckdb {
 
@@ -45468,9 +45469,22 @@ hash_t Hash(hugeint_t val) {
 	return murmurhash64(val.lower) ^ murmurhash64(val.upper);
 }
 
+template <class T>
+struct FloatingPointEqualityTransform {
+	static void OP(T &val) {
+		if (val == (T)0.0) {
+			// Turn negative zero into positive zero
+			val = (T)0.0;
+		} else if (std::isnan(val)) {
+			val = std::numeric_limits<T>::quiet_NaN();
+		}
+	}
+};
+
 template <>
 hash_t Hash(float val) {
 	static_assert(sizeof(float) == sizeof(uint32_t), "");
+	FloatingPointEqualityTransform<float>::OP(val);
 	uint32_t uval = *((uint32_t *)&val);
 	return murmurhash64(uval);
 }
@@ -45478,6 +45492,7 @@ hash_t Hash(float val) {
 template <>
 hash_t Hash(double val) {
 	static_assert(sizeof(double) == sizeof(uint64_t), "");
+	FloatingPointEqualityTransform<double>::OP(val);
 	uint64_t uval = *((uint64_t *)&val);
 	return murmurhash64(uval);
 }
@@ -142055,7 +142070,7 @@ inline bool parse_header(const char *beg, const char *end, T fn) {
 	}
 
 	if (p < end) {
-		fn(std::string(beg, key_end), decode_url(std::string(p, end), false));
+		fn(std::string(beg, key_end), std::string(p, end));
 		return true;
 	}
 
@@ -144895,7 +144910,7 @@ inline bool ClientImpl::redirect(Request &req, Response &res, Error &error) {
 		return false;
 	}
 
-	auto location = detail::decode_url(res.get_header_value("location"), false);
+	auto location = res.get_header_value("location");
 	if (location.empty()) { return false; }
 
 	const static Regex re(
@@ -196196,7 +196211,10 @@ BindResult ColumnAliasBinder::BindAlias(ExpressionBinder &enclosing_binder, Colu
 	// found an alias: bind the alias expression
 	auto expression = node.original_expressions[alias_entry->second]->Copy();
 	in_alias = true;
-	auto result = enclosing_binder.BindExpression(&expression, depth, root_expression);
+
+	// since the alias has been found, pass a depth of 0. See Issue 4978 (#16)
+	// ColumnAliasBinders are only in Having, Qualify and Where Binders
+	auto result = enclosing_binder.BindExpression(&expression, 0, root_expression);
 	in_alias = false;
 	return result;
 }
@@ -200683,9 +200701,17 @@ unique_ptr<LogicalOperator> FlattenDependentJoins::PushDownDependentJoinInternal
 		setop.column_count += correlated_columns.size();
 		return plan;
 	}
-	case LogicalOperatorType::LOGICAL_DISTINCT:
-		plan->children[0] = PushDownDependentJoin(move(plan->children[0]));
+	case LogicalOperatorType::LOGICAL_DISTINCT: {
+		auto &distinct = (LogicalDistinct &)*plan;
+		// push down into child
+		distinct.children[0] = PushDownDependentJoin(move(distinct.children[0]));
+		// add all correlated columns to the distinct targets
+		for (idx_t i = 0; i < correlated_columns.size(); i++) {
+			distinct.distinct_targets.push_back(make_unique<BoundColumnRefExpression>(
+			    correlated_columns[i].type, ColumnBinding(base_binding.table_index, base_binding.column_index + i)));
+		}
 		return plan;
+	}
 	case LogicalOperatorType::LOGICAL_EXPRESSION_GET: {
 		// expression get
 		// first we flatten the dependent join in the child

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 "4b89793a18"
-#define DUCKDB_VERSION "v0.5.2-dev2133"
+#define DUCKDB_SOURCE_ID "2f1a16b9ce"
+#define DUCKDB_VERSION "v0.5.2-dev2157"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //