duckdb 0.3.2-dev1306.0 → 0.3.2-dev1318.0

package/package.json

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

package/src/duckdb.cpp

@@ -3101,7 +3101,15 @@ string TableCatalogEntry::ToSQL() {
 			ss << ", ";
 		}
 		auto &column = columns[i];
-		ss << KeywordHelper::WriteOptionallyQuoted(column.name) << " " << column.type.ToString();
+		ss << KeywordHelper::WriteOptionallyQuoted(column.name) << " ";
+		switch (column.type.id()) {
+		case LogicalTypeId::ENUM:
+			ss << KeywordHelper::WriteOptionallyQuoted(column.type.ToString());
+			break;
+		default:
+			ss << column.type.ToString();
+			break;
+		}
 		bool not_null = not_null_columns.find(column.oid) != not_null_columns.end();
 		bool is_single_key_pk = pk_columns.find(column.oid) != pk_columns.end();
 		bool is_multi_key_pk = multi_key_pks.find(column.name) != multi_key_pks.end();
@@ -3209,6 +3217,7 @@ TableFunctionCatalogEntry::TableFunctionCatalogEntry(Catalog *catalog, SchemaCat
 
 
 
+
 #include <algorithm>
 #include <sstream>
 
@@ -3245,7 +3254,7 @@ string TypeCatalogEntry::ToSQL() {
 		Vector values_insert_order(EnumType::GetValuesInsertOrder(user_type));
 		idx_t size = EnumType::GetSize(user_type);
 		ss << "CREATE TYPE ";
-		ss << name;
+		ss << KeywordHelper::WriteOptionallyQuoted(name);
 		ss << " AS ENUM ( ";
 
 		for (idx_t i = 0; i < size; i++) {
@@ -49343,7 +49352,6 @@ SinkResultType PhysicalSimpleAggregate::Sink(ExecutionContext &context, GlobalSi
 
 	DataChunk &payload_chunk = sink.payload_chunk;
 	sink.child_executor.SetChunk(input);
-	payload_chunk.SetCardinality(input);
 	for (idx_t aggr_idx = 0; aggr_idx < aggregates.size(); aggr_idx++) {
 		DataChunk filtered_input;
 		auto &aggregate = (BoundAggregateExpression &)*aggregates[aggr_idx];
@@ -49358,6 +49366,8 @@ SinkResultType PhysicalSimpleAggregate::Sink(ExecutionContext &context, GlobalSi
 			filtered_input.Slice(input, true_sel, count);
 			sink.child_executor.SetChunk(filtered_input);
 			payload_chunk.SetCardinality(count);
+		} else {
+			payload_chunk.SetCardinality(input);
 		}
 		// resolve the child expressions of the aggregate (if any)
 		if (!aggregate.children.empty()) {
@@ -57313,11 +57323,11 @@ void BufferedCSVReader::InitParseChunk(idx_t num_cols) {
 void BufferedCSVReader::JumpToBeginning(idx_t skip_rows = 0, bool skip_header = false) {
 	ResetBuffer();
 	ResetStream();
-	SkipRowsAndReadHeader(skip_rows, skip_header);
 	sample_chunk_idx = 0;
 	bytes_in_chunk = 0;
 	end_of_file_reached = false;
 	bom_checked = false;
+	SkipRowsAndReadHeader(skip_rows, skip_header);
 }
 
 void BufferedCSVReader::SkipRowsAndReadHeader(idx_t skip_rows, bool skip_header) {
@@ -80656,17 +80666,11 @@ static void ArraySliceFunction(DataChunk &args, ExpressionState &state, Vector &
 	D_ASSERT(args.data.size() == 3);
 	auto count = args.size();
 
-	result.SetVectorType(VectorType::CONSTANT_VECTOR);
-	for (idx_t i = 0; i < args.ColumnCount(); i++) {
-		if (args.data[i].GetVectorType() != VectorType::CONSTANT_VECTOR) {
-			result.SetVectorType(VectorType::FLAT_VECTOR);
-		}
-	}
-
 	Vector &s = args.data[0];
 	Vector &b = args.data[1];
 	Vector &e = args.data[2];
 
+	s.Normalify(count);
 	switch (result.GetType().id()) {
 	case LogicalTypeId::LIST:
 		// Share the value dictionary as we are just going to slice it
@@ -80679,6 +80683,14 @@ static void ArraySliceFunction(DataChunk &args, ExpressionState &state, Vector &
 	default:
 		throw NotImplementedException("Specifier type not implemented");
 	}
+
+	result.SetVectorType(VectorType::CONSTANT_VECTOR);
+	for (idx_t i = 0; i < args.ColumnCount(); i++) {
+		if (args.data[i].GetVectorType() != VectorType::CONSTANT_VECTOR) {
+			result.SetVectorType(VectorType::FLAT_VECTOR);
+			break;
+		}
+	}
 }
 
 static unique_ptr<FunctionData> ArraySliceBind(ClientContext &context, ScalarFunction &bound_function,