From 8668fb89b8ae7833fc99aeb1a8a61ceec271c1f7 Mon Sep 17 00:00:00 2001 From: Maia Date: Fri, 16 Jan 2026 17:14:12 +0100 Subject: [PATCH 1/5] apply patches from duckdb v1.5-variegata --- src/statement_generator.cpp | 5 +++-- src/statement_simplifier.cpp | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/statement_generator.cpp b/src/statement_generator.cpp index fc34c7cd..5defc4ef 100644 --- a/src/statement_generator.cpp +++ b/src/statement_generator.cpp @@ -373,8 +373,9 @@ unique_ptr StatementGenerator::GenerateQueryNode() { GenerateCTEs(*setop); setop->setop_type = Choose({SetOperationType::EXCEPT, SetOperationType::INTERSECT, SetOperationType::UNION, SetOperationType::UNION_BY_NAME}); - setop->left = GenerateQueryNode(); - setop->right = GenerateQueryNode(); + for(idx_t i = 0; i < 2; i++) { + setop->children.push_back(GenerateQueryNode()); + } switch (setop->setop_type) { case SetOperationType::EXCEPT: case SetOperationType::INTERSECT: diff --git a/src/statement_simplifier.cpp b/src/statement_simplifier.cpp index 2cd7f068..46029288 100644 --- a/src/statement_simplifier.cpp +++ b/src/statement_simplifier.cpp @@ -196,8 +196,9 @@ void StatementSimplifier::Simplify(SelectNode &node) { } void StatementSimplifier::Simplify(SetOperationNode &node) { - Simplify(node.left); - Simplify(node.right); + for(auto &child : node.children) { + Simplify(child); + } } void StatementSimplifier::Simplify(CommonTableExpressionMap &cte) { @@ -218,8 +219,9 @@ void StatementSimplifier::Simplify(unique_ptr &node) { break; case QueryNodeType::SET_OPERATION_NODE: { auto &setop = node->Cast(); - SimplifyReplace(node, setop.left); - SimplifyReplace(node, setop.right); + for(auto &child : setop.children) { + SimplifyReplace(node, child); + } Simplify(setop); break; } From 64698095f594983075ceb0dc6763086cb34a27a3 Mon Sep 17 00:00:00 2001 From: Tmonster Date: Fri, 23 Jan 2026 13:05:04 +0100 Subject: [PATCH 2/5] add includes --- src/include/statement_generator.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/include/statement_generator.hpp b/src/include/statement_generator.hpp index 57e84467..f436275b 100644 --- a/src/include/statement_generator.hpp +++ b/src/include/statement_generator.hpp @@ -11,6 +11,8 @@ #include "duckdb.hpp" #include "duckdb/parser/parsed_data/detach_info.hpp" #include "duckdb/parser/query_node.hpp" +#include "duckdb/parser/statement/list.hpp" +#include "duckdb/parser/statement/multi_statement.hpp" #define TESTING_DIRECTORY_NAME "duckdb_unittest_tempdir" From 3dc962eb9603eb09cdbfec8216cd7111026ecd84 Mon Sep 17 00:00:00 2001 From: Tmonster Date: Fri, 23 Jan 2026 13:05:15 +0100 Subject: [PATCH 3/5] bump duckdb --- duckdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/duckdb b/duckdb index b8a06e4a..f59749da 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit b8a06e4a22672e254cd0baa68a3dbed2eb51c56e +Subproject commit f59749da9cff1eb1d59be8b6449c8d607cac975f From 36e60e33c664674b502c8e32c754638bfcc76582 Mon Sep 17 00:00:00 2001 From: Tmonster Date: Fri, 23 Jan 2026 13:06:07 +0100 Subject: [PATCH 4/5] update main distribution pipeline --- .github/workflows/MainDistributionPipeline.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml index 63463dcc..fea6ee03 100644 --- a/.github/workflows/MainDistributionPipeline.yml +++ b/.github/workflows/MainDistributionPipeline.yml @@ -14,21 +14,21 @@ concurrency: jobs: duckdb-stable-build: name: Build extension binaries - uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.4.0 + uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.4.3 with: extension_name: sqlsmith - duckdb_version: v1.4.0 - ci_tools_version: v1.4.0 + duckdb_version: f59749da9cff1eb1d59be8b6449c8d607cac975f + ci_tools_version: v1.4.3 exclude_archs: '' duckdb-stable-deploy: name: Deploy extension binaries needs: duckdb-stable-build - uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.4.0 + uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.4.3 secrets: inherit with: extension_name: sqlsmith - duckdb_version: v1.4.0 - ci_tools_version: v1.4.0 + duckdb_version: f59749da9cff1eb1d59be8b6449c8d607cac975f + ci_tools_version: v1.4.3 exclude_archs: '' deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }} From 8a1a1864c0f464ec97f349d31880c85d58c3cf2b Mon Sep 17 00:00:00 2001 From: Tom Ebergen Date: Fri, 23 Jan 2026 14:35:01 +0100 Subject: [PATCH 5/5] Update CI workflow to use main branch for tools --- .github/workflows/MainDistributionPipeline.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml index fea6ee03..0319591a 100644 --- a/.github/workflows/MainDistributionPipeline.yml +++ b/.github/workflows/MainDistributionPipeline.yml @@ -14,21 +14,21 @@ concurrency: jobs: duckdb-stable-build: name: Build extension binaries - uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.4.3 + uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main with: extension_name: sqlsmith duckdb_version: f59749da9cff1eb1d59be8b6449c8d607cac975f - ci_tools_version: v1.4.3 + ci_tools_version: main exclude_archs: '' duckdb-stable-deploy: name: Deploy extension binaries needs: duckdb-stable-build - uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.4.3 + uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main secrets: inherit with: extension_name: sqlsmith duckdb_version: f59749da9cff1eb1d59be8b6449c8d607cac975f - ci_tools_version: v1.4.3 + ci_tools_version: main exclude_archs: '' deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}