From 1420aef3342012e0b25472fc569de2e34b74556f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 21:52:55 +0000 Subject: [PATCH] vendor: Update vendored sources to duckdb/duckdb@acdbf60889033d2701a5fef360a19963cafea471 (#974) Annotate errors in table macros with the call position of the table macro (duckdb/duckdb#15590) Co-authored-by: krlmlr --- src/duckdb/src/function/table/version/pragma_version.cpp | 6 +++--- .../src/planner/binder/tableref/bind_table_function.cpp | 9 ++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/duckdb/src/function/table/version/pragma_version.cpp b/src/duckdb/src/function/table/version/pragma_version.cpp index 77e744b6b..6bb466621 100644 --- a/src/duckdb/src/function/table/version/pragma_version.cpp +++ b/src/duckdb/src/function/table/version/pragma_version.cpp @@ -1,5 +1,5 @@ #ifndef DUCKDB_PATCH_VERSION -#define DUCKDB_PATCH_VERSION "4-dev4106" +#define DUCKDB_PATCH_VERSION "4-dev4108" #endif #ifndef DUCKDB_MINOR_VERSION #define DUCKDB_MINOR_VERSION 1 @@ -8,10 +8,10 @@ #define DUCKDB_MAJOR_VERSION 1 #endif #ifndef DUCKDB_VERSION -#define DUCKDB_VERSION "v1.1.4-dev4106" +#define DUCKDB_VERSION "v1.1.4-dev4108" #endif #ifndef DUCKDB_SOURCE_ID -#define DUCKDB_SOURCE_ID "2edfde3071" +#define DUCKDB_SOURCE_ID "acdbf60889" #endif #include "duckdb/function/table/system_functions.hpp" #include "duckdb/main/database.hpp" diff --git a/src/duckdb/src/planner/binder/tableref/bind_table_function.cpp b/src/duckdb/src/planner/binder/tableref/bind_table_function.cpp index 2d222b4fc..3f4c249bd 100644 --- a/src/duckdb/src/planner/binder/tableref/bind_table_function.cpp +++ b/src/duckdb/src/planner/binder/tableref/bind_table_function.cpp @@ -283,7 +283,14 @@ unique_ptr Binder::Bind(TableFunctionRef &ref) { binder->can_contain_nulls = true; binder->alias = ref.alias.empty() ? "unnamed_query" : ref.alias; - auto query = binder->BindNode(*query_node); + unique_ptr query; + try { + query = binder->BindNode(*query_node); + } catch (std::exception &ex) { + ErrorData error(ex); + error.AddQueryLocation(ref); + error.Throw(); + } idx_t bind_index = query->GetRootIndex(); // string alias;