Skip to content

Commit 1b7fddf

Browse files
committed
vendor: Update vendored sources to duckdb/duckdb@a7422f6
Implement `json_each`/`json_tree` (duckdb/duckdb#17406)
1 parent 14c77a3 commit 1b7fddf

File tree

6 files changed

+12
-7
lines changed

6 files changed

+12
-7
lines changed

src/duckdb/src/execution/operator/scan/physical_table_scan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class TableScanGlobalSourceState : public GlobalSourceState {
4949
}
5050
input_chunk.Initialize(context, input_types);
5151
for (idx_t c = 0; c < op.parameters.size(); c++) {
52-
input_chunk.data[c].SetValue(0, op.parameters[c]);
52+
input_chunk.data[c].Reference(op.parameters[c]);
5353
}
5454
input_chunk.SetCardinality(1);
5555
}

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-dev3243"
2+
#define DUCKDB_PATCH_VERSION "0-dev3257"
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-dev3243"
11+
#define DUCKDB_VERSION "v1.3.0-dev3257"
1212
#endif
1313
#ifndef DUCKDB_SOURCE_ID
14-
#define DUCKDB_SOURCE_ID "332674c349"
14+
#define DUCKDB_SOURCE_ID "a7422f6940"
1515
#endif
1616
#include "duckdb/function/table/system_functions.hpp"
1717
#include "duckdb/main/database.hpp"

src/duckdb/src/include/duckdb/common/column_index.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ struct ColumnIndex {
5959
this->child_indexes.push_back(std::move(new_index));
6060
}
6161
bool IsRowIdColumn() const {
62-
return index == DConstants::INVALID_INDEX;
62+
return index == COLUMN_IDENTIFIER_ROW_ID;
63+
}
64+
bool IsEmptyColumn() const {
65+
return index == COLUMN_IDENTIFIER_EMPTY;
6366
}
6467
bool IsVirtualColumn() const {
6568
return index >= VIRTUAL_COLUMN_START;

src/duckdb/src/include/duckdb/main/extension_entries.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ static constexpr ExtensionFunctionEntry EXTENSION_FUNCTIONS[] = {
354354
{"json_array_length", "json", CatalogType::SCALAR_FUNCTION_ENTRY},
355355
{"json_contains", "json", CatalogType::SCALAR_FUNCTION_ENTRY},
356356
{"json_deserialize_sql", "json", CatalogType::SCALAR_FUNCTION_ENTRY},
357+
{"json_each", "json", CatalogType::TABLE_FUNCTION_ENTRY},
357358
{"json_execute_serialized_sql", "json", CatalogType::PRAGMA_FUNCTION_ENTRY},
358359
{"json_execute_serialized_sql", "json", CatalogType::TABLE_FUNCTION_ENTRY},
359360
{"json_exists", "json", CatalogType::SCALAR_FUNCTION_ENTRY},
@@ -374,6 +375,7 @@ static constexpr ExtensionFunctionEntry EXTENSION_FUNCTIONS[] = {
374375
{"json_structure", "json", CatalogType::SCALAR_FUNCTION_ENTRY},
375376
{"json_transform", "json", CatalogType::SCALAR_FUNCTION_ENTRY},
376377
{"json_transform_strict", "json", CatalogType::SCALAR_FUNCTION_ENTRY},
378+
{"json_tree", "json", CatalogType::TABLE_FUNCTION_ENTRY},
377379
{"json_type", "json", CatalogType::SCALAR_FUNCTION_ENTRY},
378380
{"json_valid", "json", CatalogType::SCALAR_FUNCTION_ENTRY},
379381
{"json_value", "json", CatalogType::SCALAR_FUNCTION_ENTRY},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ unique_ptr<LogicalOperator> Binder::BindTableFunctionInternal(TableFunction &tab
267267
get->named_parameters = named_parameters;
268268
get->input_table_types = input_table_types;
269269
get->input_table_names = input_table_names;
270-
if (table_function.in_out_function && !table_function.projection_pushdown) {
270+
if (table_function.in_out_function) {
271271
for (idx_t i = 0; i < return_types.size(); i++) {
272272
get->AddColumnId(i);
273273
}

src/duckdb/src/planner/subquery/flatten_dependent_join.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ unique_ptr<LogicalOperator> FlattenDependentJoins::PushDownDependentJoinInternal
922922
for (idx_t i = 0; i < correlated_columns.size(); i++) {
923923
get.projected_input.push_back(this->delim_offset + i);
924924
}
925-
this->delim_offset = get.returned_types.size();
925+
this->delim_offset = get.GetColumnIds().size();
926926
this->data_offset = 0;
927927

928928
RewriteCorrelatedExpressions rewriter(base_binding, correlated_map, lateral_depth);

0 commit comments

Comments
 (0)