Skip to content

Commit e0183cf

Browse files
duckdblabs-botgithub-actions[bot]
authored andcommitted
Update vendored DuckDB sources to 50f3d64620
1 parent 00ad4b1 commit e0183cf

5 files changed

Lines changed: 19 additions & 7 deletions

File tree

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 "2-dev56"
2+
#define DUCKDB_PATCH_VERSION "2-dev63"
33
#endif
44
#ifndef DUCKDB_MINOR_VERSION
55
#define DUCKDB_MINOR_VERSION 4
@@ -8,10 +8,10 @@
88
#define DUCKDB_MAJOR_VERSION 1
99
#endif
1010
#ifndef DUCKDB_VERSION
11-
#define DUCKDB_VERSION "v1.4.2-dev56"
11+
#define DUCKDB_VERSION "v1.4.2-dev63"
1212
#endif
1313
#ifndef DUCKDB_SOURCE_ID
14-
#define DUCKDB_SOURCE_ID "f707ac5f0a"
14+
#define DUCKDB_SOURCE_ID "50f3d64620"
1515
#endif
1616
#include "duckdb/function/table/system_functions.hpp"
1717
#include "duckdb/main/database.hpp"

src/duckdb/src/include/duckdb/main/capi/capi_internal.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ struct PreparedStatementWrapper {
5151
//! Map of name -> values
5252
case_insensitive_map_t<BoundParameterData> values;
5353
unique_ptr<PreparedStatement> statement;
54+
bool success = true;
55+
ErrorData error_data;
5456
};
5557

5658
struct ExtractStatementsWrapper {

src/duckdb/src/include/duckdb/planner/bound_statement.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#pragma once
1010

1111
#include "duckdb/common/string.hpp"
12+
#include "duckdb/common/unique_ptr.hpp"
1213
#include "duckdb/common/vector.hpp"
1314

1415
namespace duckdb {

src/duckdb/src/main/capi/prepared-c.cpp

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,13 @@ duckdb_state duckdb_prepare(duckdb_connection connection, const char *query,
8888

8989
const char *duckdb_prepare_error(duckdb_prepared_statement prepared_statement) {
9090
auto wrapper = reinterpret_cast<PreparedStatementWrapper *>(prepared_statement);
91-
if (!wrapper || !wrapper->statement || !wrapper->statement->HasError()) {
91+
if (!wrapper) {
92+
return nullptr;
93+
}
94+
if (!wrapper->success) {
95+
return wrapper->error_data.Message().c_str();
96+
}
97+
if (!wrapper->statement || !wrapper->statement->HasError()) {
9298
return nullptr;
9399
}
94100
return wrapper->statement->error.Message().c_str();
@@ -229,9 +235,10 @@ duckdb_state duckdb_bind_value(duckdb_prepared_statement prepared_statement, idx
229235
return DuckDBError;
230236
}
231237
if (param_idx <= 0 || param_idx > wrapper->statement->named_param_map.size()) {
232-
wrapper->statement->error =
238+
wrapper->error_data =
233239
duckdb::InvalidInputException("Can not bind to parameter number %d, statement only has %d parameter(s)",
234240
param_idx, wrapper->statement->named_param_map.size());
241+
wrapper->success = false;
235242
return DuckDBError;
236243
}
237244
auto identifier = duckdb_parameter_name_internal(prepared_statement, param_idx);

src/duckdb/src/parallel/task_executor.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,10 @@ TaskExecutionResult BaseExecutorTask::Execute(TaskExecutionMode mode) {
6969
return TaskExecutionResult::TASK_FINISHED;
7070
}
7171
try {
72-
TaskNotifier task_notifier {executor.context};
73-
ExecuteTask();
72+
{
73+
TaskNotifier task_notifier {executor.context};
74+
ExecuteTask();
75+
}
7476
executor.FinishTask();
7577
return TaskExecutionResult::TASK_FINISHED;
7678
} catch (std::exception &ex) {

0 commit comments

Comments
 (0)