Skip to content

Commit 6a94f2b

Browse files
committed
fix: update SetOperationNode API for DuckDB main branch
Use children vector instead of left/right members to support the DuckDB v1.5+ API change.
1 parent 4c294fa commit 6a94f2b

2 files changed

Lines changed: 8 additions & 18 deletions

File tree

.github/workflows/MainDistributionPipeline.yml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,10 @@ concurrency:
1212
cancel-in-progress: true
1313

1414
jobs:
15-
# TODO: Re-enable once compatible with DuckDB main (SetOperationNode API change)
16-
# duckdb-next-build:
17-
# name: Build extension binaries
18-
# uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
19-
# with:
20-
# duckdb_version: main
21-
# ci_tools_version: main
22-
# extension_name: parser_tools
23-
24-
duckdb-stable-build:
15+
duckdb-next-build:
2516
name: Build extension binaries
26-
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.4.4
17+
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
2718
with:
28-
duckdb_version: v1.4.4
29-
ci_tools_version: v1.4.4
19+
duckdb_version: main
20+
ci_tools_version: main
3021
extension_name: parser_tools

src/parse_tables.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,10 @@ static void ExtractTablesFromQueryNode(
228228
else if (node.type == QueryNodeType::SET_OPERATION_NODE) {
229229
auto &set_node = (SetOperationNode &)node;
230230

231-
if (set_node.left) {
232-
ExtractTablesFromQueryNode(*set_node.left, results, context, cte_map);
233-
}
234-
if (set_node.right) {
235-
ExtractTablesFromQueryNode(*set_node.right, results, context, cte_map);
231+
for (auto &child : set_node.children) {
232+
if (child) {
233+
ExtractTablesFromQueryNode(*child, results, context, cte_map);
234+
}
236235
}
237236
}
238237

0 commit comments

Comments
 (0)