duckdb 0.5.2-dev2251.0 → 0.5.2-dev2256.0

package/package.json

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

package/src/duckdb.cpp

@@ -81718,6 +81718,16 @@ bool ParallelCSVReader::SetPosition(DataChunk &insert_chunk) {
 	if (buffer->buffer->IsCSVFileFirstBuffer() && start_buffer == position_buffer &&
 	    start_buffer == buffer->buffer->GetStart()) {
 		// First buffer doesn't need any setting
+		// Unless we have a header
+		if (options.header && options.auto_detect) {
+			for (; position_buffer < end_buffer; position_buffer++) {
+				if (StringUtil::CharacterIsNewline((*buffer)[position_buffer])) {
+					position_buffer++;
+					return true;
+				}
+			}
+			return false;
+		}
 		return true;
 	}
 
@@ -81841,8 +81851,9 @@ normal : {
 			goto add_value;
 		} else if (StringUtil::CharacterIsNewline(c)) {
 			// newline: add row
-			D_ASSERT(try_add_line || column == insert_chunk.ColumnCount() - 1);
-			goto add_row;
+			if (column > 0 || try_add_line) {
+				goto add_row;
+			}
 		}
 	}
 	if (!BufferRemainder()) {
@@ -82016,9 +82027,8 @@ final_state : {
 	}
 	// If this is the last buffer, we have to read the last value
 	if (buffer->buffer->IsCSVFileLastBuffer() || (buffer->next_buffer->IsCSVFileLastBuffer())) {
-		if (column > 0 || position_buffer > start_buffer) {
+		if (column > 0 || try_add_line) {
 			// remaining values to be added to the chunk
-			D_ASSERT(column == insert_chunk.ColumnCount() - 1);
 			AddValue(buffer->GetValue(start_buffer, position_buffer, offset), column, escape_positions, has_quotes);
 			if (try_add_line) {
 				bool success = column == sql_types.size();
@@ -126407,13 +126417,10 @@ static unique_ptr<GlobalTableFunctionState> ParallelCSVInitGlobal(ClientContext
 		return make_unique<ParallelCSVGlobalState>();
 	}
 	unique_ptr<CSVFileHandle> file_handle;
-	if (bind_data.initial_reader) {
-		file_handle = move(bind_data.initial_reader->file_handle);
-		bind_data.initial_reader.reset();
-	} else {
-		bind_data.options.file_path = bind_data.files[0];
-		file_handle = ReadCSV::OpenCSV(bind_data.options, context);
-	}
+
+	bind_data.options.file_path = bind_data.files[0];
+	file_handle = ReadCSV::OpenCSV(bind_data.options, context);
+
 	idx_t rows_to_skip = bind_data.options.skip_rows + (bind_data.options.has_header ? 1 : 0);
 	return make_unique<ParallelCSVGlobalState>(context, move(file_handle), bind_data.files,
 	                                           context.db->NumberOfThreads(), bind_data.options.buffer_size,

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 "2d34ffb455"
-#define DUCKDB_VERSION "v0.5.2-dev2251"
+#define DUCKDB_SOURCE_ID "47bb125a91"
+#define DUCKDB_VERSION "v0.5.2-dev2256"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //