Skip to content

Commit 26631bc

Browse files
committed
vendor: Update vendored sources to duckdb/duckdb@54945ef
[Dev] Fix crash when describing a table with a virtual column (duckdb/duckdb#17544) Fix extension test (duckdb/duckdb#17536)
1 parent 2ecf2b4 commit 26631bc

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

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 "0-dev3631"
2+
#define DUCKDB_PATCH_VERSION "0-dev3636"
33
#endif
44
#ifndef DUCKDB_MINOR_VERSION
55
#define DUCKDB_MINOR_VERSION 3
@@ -8,10 +8,10 @@
88
#define DUCKDB_MAJOR_VERSION 1
99
#endif
1010
#ifndef DUCKDB_VERSION
11-
#define DUCKDB_VERSION "v1.3.0-dev3631"
11+
#define DUCKDB_VERSION "v1.3.0-dev3636"
1212
#endif
1313
#ifndef DUCKDB_SOURCE_ID
14-
#define DUCKDB_SOURCE_ID "1f0067f1a5"
14+
#define DUCKDB_SOURCE_ID "54945efdd8"
1515
#endif
1616
#include "duckdb/function/table/system_functions.hpp"
1717
#include "duckdb/main/database.hpp"

src/duckdb/src/planner/binder/tableref/bind_showref.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
namespace duckdb {
1414

1515
struct BaseTableColumnInfo {
16-
optional_ptr<TableCatalogEntry> table;
17-
optional_ptr<const ColumnDefinition> column;
16+
optional_ptr<TableCatalogEntry> table = nullptr;
17+
optional_ptr<const ColumnDefinition> column = nullptr;
1818
};
1919

2020
BaseTableColumnInfo FindBaseTableColumn(LogicalOperator &op, ColumnBinding binding) {
@@ -32,8 +32,12 @@ BaseTableColumnInfo FindBaseTableColumn(LogicalOperator &op, ColumnBinding bindi
3232
if (!get.projection_ids.empty()) {
3333
throw InternalException("Projection ids should not exist here");
3434
}
35-
result.table = table;
3635
auto base_column_id = get.GetColumnIds()[binding.column_index];
36+
if (base_column_id.IsVirtualColumn()) {
37+
//! Virtual column (like ROW_ID) does not have a ColumnDefinition entry in the TableCatalogEntry
38+
return result;
39+
}
40+
result.table = table;
3741
result.column = &table->GetColumn(LogicalIndex(base_column_id.GetPrimaryIndex()));
3842
return result;
3943
}

0 commit comments

Comments
 (0)