Skip to content

Commit 5f87009

Browse files
committed
vendor: Update vendored sources to duckdb/duckdb@45bd117
Nightly Fixes (duckdb/duckdb#15690)
1 parent 00689a0 commit 5f87009

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

src/duckdb/src/execution/operator/csv_scanner/scanner/column_count_scanner.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,17 @@ void ColumnCountScanner::FinalizeChunkProcess() {
141141
cur_buffer_handle = buffer_manager->GetBuffer(++iterator.pos.buffer_idx);
142142
if (!cur_buffer_handle) {
143143
buffer_handle_ptr = nullptr;
144+
if (states.IsQuotedCurrent() && !states.IsUnquoted()) {
145+
// We are finishing our file on a quoted value that is never unquoted, straight to jail.
146+
result.error = true;
147+
return;
148+
}
144149
if (states.EmptyLine() || states.NewRow() || states.IsCurrentNewRow() || states.IsNotSet()) {
145150
return;
146151
}
147152
// This means we reached the end of the file, we must add a last line if there is any to be added
148153
if (result.comment) {
149-
// If it's a comment we add the last line via unsetcomment
154+
// If it's a comment we add the last line via unset comment
150155
result.UnsetComment(result, NumericLimits<idx_t>::Maximum());
151156
} else {
152157
// OW, we do a regular AddRow

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#ifndef DUCKDB_PATCH_VERSION
2-
#define DUCKDB_PATCH_VERSION "4-dev4508"
2+
#define DUCKDB_PATCH_VERSION "4-dev4512"
33
#endif
44
#ifndef DUCKDB_MINOR_VERSION
55
#define DUCKDB_MINOR_VERSION 1
@@ -8,10 +8,10 @@
88
#define DUCKDB_MAJOR_VERSION 1
99
#endif
1010
#ifndef DUCKDB_VERSION
11-
#define DUCKDB_VERSION "v1.1.4-dev4508"
11+
#define DUCKDB_VERSION "v1.1.4-dev4512"
1212
#endif
1313
#ifndef DUCKDB_SOURCE_ID
14-
#define DUCKDB_SOURCE_ID "cb05b0d2f1"
14+
#define DUCKDB_SOURCE_ID "45bd117094"
1515
#endif
1616
#include "duckdb/function/table/system_functions.hpp"
1717
#include "duckdb/main/database.hpp"

0 commit comments

Comments
 (0)