duckdb 0.5.1-dev21.0 → 0.5.1-dev37.0

package/package.json

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

package/src/duckdb.cpp

@@ -171777,7 +171777,7 @@ LogicalType Transformer::TransformTypeName(duckdb_libpgquery::PGTypeName *type_n
 
 		result_type = LogicalType::MAP(move(children));
 	} else {
-		int8_t width, scale;
+		int64_t width, scale;
 		if (base_type == LogicalTypeId::DECIMAL) {
 			// default decimal width/scale
 			width = 18;
@@ -181201,7 +181201,20 @@ BoundStatement Binder::Bind(VacuumStatement &stmt) {
 			auto &get = (LogicalGet &)*ref->get;
 			columns.insert(columns.end(), get.names.begin(), get.names.end());
 		}
+
+		case_insensitive_set_t column_name_set;
+		vector<string> non_generated_column_names;
 		for (auto &col_name : columns) {
+			if (column_name_set.count(col_name) > 0) {
+				throw BinderException("Vacuum the same column twice(same name in column name list)");
+			}
+			column_name_set.insert(col_name);
+			auto &col = ref->table->GetColumn(col_name);
+			// ignore generated column
+			if (col.Generated()) {
+				continue;
+			}
+			non_generated_column_names.push_back(col_name);
 			ColumnRefExpression colref(col_name, ref->table->name);
 			auto result = bind_context.BindColumn(colref, 0);
 			if (result.HasError()) {
@@ -181209,17 +181222,29 @@ BoundStatement Binder::Bind(VacuumStatement &stmt) {
 			}
 			select_list.push_back(move(result.expression));
 		}
-		auto table_scan = CreatePlan(*ref);
-		D_ASSERT(table_scan->type == LogicalOperatorType::LOGICAL_GET);
-		auto &get = (LogicalGet &)*table_scan;
-		for (idx_t i = 0; i < get.column_ids.size(); i++) {
-			stmt.info->column_id_map[i] = get.column_ids[i];
-		}
+		stmt.info->columns = move(non_generated_column_names);
+		if (!select_list.empty()) {
+			auto table_scan = CreatePlan(*ref);
+			D_ASSERT(table_scan->type == LogicalOperatorType::LOGICAL_GET);
 
-		auto projection = make_unique<LogicalProjection>(GenerateTableIndex(), move(select_list));
-		projection->children.push_back(move(table_scan));
+			auto &get = (LogicalGet &)*table_scan;
+
+			D_ASSERT(select_list.size() == get.column_ids.size());
+			D_ASSERT(stmt.info->columns.size() == get.column_ids.size());
+			for (idx_t i = 0; i < get.column_ids.size(); i++) {
+				stmt.info->column_id_map[i] = ref->table->columns[get.column_ids[i]].StorageOid();
+			}
 
-		root = move(projection);
+			auto projection = make_unique<LogicalProjection>(GenerateTableIndex(), move(select_list));
+			projection->children.push_back(move(table_scan));
+
+			root = move(projection);
+		} else {
+			// eg. CREATE TABLE test (x AS (1));
+			//     ANALYZE test;
+			// Make it not a SINK so it doesn't have to do anything
+			stmt.info->has_table = false;
+		}
 	}
 	auto vacuum = make_unique<LogicalSimple>(LogicalOperatorType::LOGICAL_VACUUM, move(stmt.info));
 	if (root) {

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 "cf4b8dcee"
-#define DUCKDB_VERSION "v0.5.1-dev21"
+#define DUCKDB_SOURCE_ID "8de8547c8"
+#define DUCKDB_VERSION "v0.5.1-dev37"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -27469,7 +27469,8 @@ public:
 public:
 	template <class T, class BASE>
 	static string ToString(const T &entry) {
-		return entry.left->ToString() + " " + ExpressionTypeToOperator(entry.type) + " " + entry.right->ToString();
+		return StringUtil::Format("(%s) %s (%s)", entry.left->ToString(), ExpressionTypeToOperator(entry.type),
+		                          entry.right->ToString());
 	}
 };
 } // namespace duckdb