duckdb 0.3.3-dev1229.0 → 0.3.3-dev1232.0

package/package.json

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

package/src/duckdb.cpp

@@ -5307,15 +5307,19 @@ int ResultArrowArrayStreamWrapper::MyStreamGetNext(struct ArrowArrayStream *stre
 		out->release = nullptr;
 		return 0;
 	}
-	while (chunk_result->size() < my_stream->batch_size) {
+	unique_ptr<DataChunk> agg_chunk_result = make_unique<DataChunk>();
+	agg_chunk_result->Initialize(chunk_result->GetTypes());
+	agg_chunk_result->Append(*chunk_result, true);
+
+	while (agg_chunk_result->size() < my_stream->batch_size) {
 		auto new_chunk = result.Fetch();
 		if (!new_chunk) {
 			break;
 		} else {
-			chunk_result->Append(*new_chunk, true);
+			agg_chunk_result->Append(*new_chunk, true);
 		}
 	}
-	chunk_result->ToArrowArray(out);
+	agg_chunk_result->ToArrowArray(out);
 	return 0;
 }
 
@@ -97480,8 +97484,7 @@ void ArrowTableFunction::ArrowToDuckDB(ArrowScanState &scan_state,
 		if (array.length != scan_state.chunk->arrow_array.length) {
 			throw InvalidInputException("arrow_scan: array length mismatch");
 		}
-		output.data[idx].GetBuffer()->SetAuxiliaryData(make_unique<ArrowAuxiliaryData>(scan_state.chunk),
-		                                               VectorAuxiliaryDataType::ARROW_AUXILIARY);
+		output.data[idx].GetBuffer()->SetAuxiliaryData(make_unique<ArrowAuxiliaryData>(scan_state.chunk));
 		if (array.dictionary) {
 			ColumnArrowToDuckDBDictionary(output.data[idx], array, scan_state, output.size(), arrow_convert_data,
 			                              col_idx, arrow_convert_idx);

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 "f96b137eb"
-#define DUCKDB_VERSION "v0.3.3-dev1229"
+#define DUCKDB_SOURCE_ID "041fb2cc7"
+#define DUCKDB_VERSION "v0.3.3-dev1232"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -3412,7 +3412,7 @@ public:
 		return aux_data.get();
 	}
 
-	void SetAuxiliaryData(unique_ptr<VectorAuxiliaryData> aux_data_p, VectorAuxiliaryDataType aux_type_p) {
+	void SetAuxiliaryData(unique_ptr<VectorAuxiliaryData> aux_data_p) {
 		aux_data = move(aux_data_p);
 	}