duckdb 0.3.5-dev503.0 → 0.3.5-dev516.0

package/package.json

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

package/src/duckdb.cpp

@@ -159268,6 +159268,11 @@ BindResult ExpressionBinder::BindExpression(CollateExpression &expr, idx_t depth
 
 
 
+
+
+
+
+
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -159304,11 +159309,6 @@ private:
 } // namespace duckdb
 
 
-
-
-
-
-
 namespace duckdb {
 
 unique_ptr<ParsedExpression> ExpressionBinder::QualifyColumnName(const string &column_name, string &error_message) {
@@ -159393,6 +159393,33 @@ unique_ptr<ParsedExpression> ExpressionBinder::CreateStructExtract(unique_ptr<Pa
 	return move(extract_fun);
 }
 
+unique_ptr<ParsedExpression> ExpressionBinder::CreateStructPack(ColumnRefExpression &colref) {
+	D_ASSERT(colref.column_names.size() <= 2);
+	string error_message;
+	auto &table_name = colref.column_names.back();
+	auto binding = binder.bind_context.GetBinding(table_name, error_message);
+	if (!binding) {
+		return nullptr;
+	}
+	if (colref.column_names.size() == 2) {
+		// "schema_name.table_name"
+		auto table_entry = binding->GetTableEntry();
+		if (!table_entry) {
+			return nullptr;
+		}
+		auto &schema_name = colref.column_names[0];
+		if (table_entry->schema->name != schema_name || table_entry->name != table_name) {
+			return nullptr;
+		}
+	}
+	// We found the table, now create the struct_pack expression
+	vector<unique_ptr<ParsedExpression>> child_exprs;
+	for (const auto &column_name : binding->names) {
+		child_exprs.push_back(make_unique<ColumnRefExpression>(column_name, table_name));
+	}
+	return make_unique<FunctionExpression>("struct_pack", move(child_exprs));
+}
+
 unique_ptr<ParsedExpression> ExpressionBinder::QualifyColumnName(ColumnRefExpression &colref, string &error_message) {
 	idx_t column_parts = colref.column_names.size();
 	// column names can have an arbitrary amount of dots
@@ -159401,7 +159428,13 @@ unique_ptr<ParsedExpression> ExpressionBinder::QualifyColumnName(ColumnRefExpres
 		// no dots (i.e. "part1")
 		// -> part1 refers to a column
 		// check if we can qualify the column name with the table name
-		return QualifyColumnName(colref.GetColumnName(), error_message);
+		auto qualified_colref = QualifyColumnName(colref.GetColumnName(), error_message);
+		if (qualified_colref) {
+			// we could: return it
+			return qualified_colref;
+		}
+		// we could not! Try creating an implicit struct_pack
+		return CreateStructPack(colref);
 	} else if (column_parts == 2) {
 		// one dot (i.e. "part1.part2")
 		// EITHER:
@@ -159417,12 +159450,12 @@ unique_ptr<ParsedExpression> ExpressionBinder::QualifyColumnName(ColumnRefExpres
 			auto new_colref = make_unique<ColumnRefExpression>(colref.column_names[0]);
 			string other_error;
 			auto qualified_colref = QualifyColumnName(colref.column_names[0], other_error);
-			if (!qualified_colref) {
-				// we could not! bail
-				return nullptr;
+			if (qualified_colref) {
+				// we could: create a struct extract
+				return CreateStructExtract(move(qualified_colref), colref.column_names[1]);
 			}
-			// we could: create a struct extract
-			return CreateStructExtract(move(qualified_colref), colref.column_names[1]);
+			// we could not! Try creating an implicit struct_pack
+			return CreateStructPack(colref);
 		}
 	} else {
 		// two or more dots (i.e. "part1.part2.part3.part4...")
@@ -179611,6 +179644,9 @@ string DistinctStatistics::ToString() const {
 }
 
 idx_t DistinctStatistics::GetCount() const {
+	if (sample_count == 0 || total_count == 0) {
+		return 0;
+	}
 	// Estimate HLL count because we use sampling
 	double hll_count = log->Count();
 	double unique_proportion = hll_count / double(sample_count);

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 "b709cce20"
-#define DUCKDB_VERSION "v0.3.5-dev503"
+#define DUCKDB_SOURCE_ID "d57a75443"
+#define DUCKDB_VERSION "v0.3.5-dev516"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -13218,6 +13218,7 @@ public:
 	string Bind(unique_ptr<ParsedExpression> *expr, idx_t depth, bool root_expression = false);
 
 	unique_ptr<ParsedExpression> CreateStructExtract(unique_ptr<ParsedExpression> base, string field_name);
+	unique_ptr<ParsedExpression> CreateStructPack(ColumnRefExpression &colref);
 	BindResult BindQualifiedColumnName(ColumnRefExpression &colref, const string &table_name);
 
 	unique_ptr<ParsedExpression> QualifyColumnName(const string &column_name, string &error_message);