Skip to content

Commit

Permalink
vendor: Update vendored sources to duckdb/duckdb@acdbf60 (#974)
Browse files Browse the repository at this point in the history
Annotate errors in table macros with the call position of the table macro (duckdb/duckdb#15590)

Co-authored-by: krlmlr <[email protected]>
  • Loading branch information
github-actions[bot] and krlmlr authored Jan 7, 2025
1 parent bafb8c7 commit 1420aef
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/duckdb/src/function/table/version/pragma_version.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,14 @@ unique_ptr<BoundTableRef> 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<BoundQueryNode> 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;
Expand Down

0 comments on commit 1420aef

Please sign in to comment.