duckdb 0.7.2-dev2675.0 → 0.7.2-dev2699.0

package/package.json

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

package/src/duckdb/src/common/adbc/adbc.cpp

@@ -72,7 +72,10 @@ AdbcStatusCode DatabaseNew(struct AdbcDatabase *database, struct AdbcError *erro
 	CHECK_TRUE(database, error, "Missing database object");
 
 	database->private_data = nullptr;
-	auto wrapper = (DuckDBAdbcDatabaseWrapper *)malloc(sizeof(DuckDBAdbcDatabaseWrapper));
+	// you can't malloc a struct with a non-trivial C++ constructor
+	// and std::string has a non-trivial constructor. so we need
+	// to use new and delete rather than malloc and free.
+	auto wrapper = new DuckDBAdbcDatabaseWrapper;
 	CHECK_TRUE(wrapper, error, "Allocation error");
 
 	database->private_data = wrapper;
@@ -112,7 +115,7 @@ AdbcStatusCode DatabaseRelease(struct AdbcDatabase *database, struct AdbcError *
 
 		duckdb_close(&wrapper->database);
 		duckdb_destroy_config(&wrapper->config);
-		free(database->private_data);
+		delete wrapper;
 		database->private_data = nullptr;
 	}
 	return ADBC_STATUS_OK;

package/src/duckdb/src/execution/operator/persistent/parallel_csv_reader.cpp

@@ -124,6 +124,8 @@ bool ParallelCSVReader::SetPosition(DataChunk &insert_chunk) {
 	while (!successfully_read_first_line) {
 		DataChunk first_line_chunk;
 		first_line_chunk.Initialize(allocator, return_types);
+		// Ensure that parse_chunk has no gunk when trying to figure new line
+		parse_chunk.Reset();
 		for (; position_buffer < end_buffer; position_buffer++) {
 			if (StringUtil::CharacterIsNewline((*buffer)[position_buffer])) {
 				bool carriage_return = (*buffer)[position_buffer] == '\r';
@@ -183,6 +185,8 @@ bool ParallelCSVReader::SetPosition(DataChunk &insert_chunk) {
 	if (verification_positions.beginning_of_first_line == 0) {
 		verification_positions.beginning_of_first_line = position_buffer;
 	}
+	// Ensure that parse_chunk has no gunk when trying to figure new line
+	parse_chunk.Reset();
 
 	verification_positions.end_of_last_line = position_buffer;
 	finished = false;

package/src/duckdb/src/function/table/version/pragma_version.cpp

@@ -1,8 +1,8 @@
 #ifndef DUCKDB_VERSION
-#define DUCKDB_VERSION "0.7.2-dev2675"
+#define DUCKDB_VERSION "0.7.2-dev2699"
 #endif
 #ifndef DUCKDB_SOURCE_ID
-#define DUCKDB_SOURCE_ID "688b2f1f8c"
+#define DUCKDB_SOURCE_ID "199c0211c7"
 #endif
 #include "duckdb/function/table/system_functions.hpp"
 #include "duckdb/main/database.hpp"

package/src/duckdb/src/include/duckdb/main/query_result.hpp

@@ -20,7 +20,7 @@ enum class QueryResultType : uint8_t { MATERIALIZED_RESULT, STREAM_RESULT, PENDI
 
 //! A set of properties from the client context that can be used to interpret the query result
 struct ClientProperties {
-	string timezone;
+	string time_zone;
 };
 
 class BaseQueryResult {

package/src/duckdb/src/main/client_context.cpp

@@ -1156,7 +1156,7 @@ ParserOptions ClientContext::GetParserOptions() const {
 
 ClientProperties ClientContext::GetClientProperties() const {
 	ClientProperties properties;
-	properties.timezone = ClientConfig::GetConfig(*this).ExtractTimezone();
+	properties.time_zone = ClientConfig::GetConfig(*this).ExtractTimezone();
 	return properties;
 }
 

package/src/duckdb/src/main/query_result.cpp

@@ -165,7 +165,7 @@ string QueryResult::HeaderToString() {
 }
 
 string QueryResult::GetConfigTimezone(QueryResult &query_result) {
-	return query_result.client_properties.timezone;
+	return query_result.client_properties.time_zone;
 }
 
 } // namespace duckdb