From 2096576ca6d685a1ddda25d6f8f282931d8e2dee Mon Sep 17 00:00:00 2001 From: taniabogatsch <44262898+taniabogatsch@users.noreply.github.com> Date: Tue, 17 Feb 2026 12:09:48 +0100 Subject: [PATCH 1/2] apply patch --- src/include/statement_generator.hpp | 12 +----------- src/statement_generator.cpp | 9 ++++++--- src/statement_simplifier.cpp | 10 ++++++---- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/include/statement_generator.hpp b/src/include/statement_generator.hpp index 57e84467..2b60c00c 100644 --- a/src/include/statement_generator.hpp +++ b/src/include/statement_generator.hpp @@ -11,21 +11,11 @@ #include "duckdb.hpp" #include "duckdb/parser/parsed_data/detach_info.hpp" #include "duckdb/parser/query_node.hpp" +#include "duckdb/parser/tokens.hpp" #define TESTING_DIRECTORY_NAME "duckdb_unittest_tempdir" namespace duckdb { -class SQLStatement; -class SelectStatement; -class InsertStatement; -class UpdateStatement; -class DeleteStatement; -class SetStatement; -class TableRef; -class SelectNode; -class SetOperationNode; -class QueryNode; -class ParsedExpression; class ResultModifier; class OrderModifier; class UpdateSetInfo; diff --git a/src/statement_generator.cpp b/src/statement_generator.cpp index 455833bc..701f85e0 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: @@ -467,7 +468,9 @@ unique_ptr StatementGenerator::GenerateBaseTableRef() { } case CatalogType::VIEW_ENTRY: { auto &view = entry.Cast(); - column_count = view.types.size(); + view.BindView(context); + auto view_columns = view.GetColumnInfo(); + column_count = view_columns->types.size(); break; } default: 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 cbe9814e458df5200cb17d6e41758b9a9ca61e24 Mon Sep 17 00:00:00 2001 From: taniabogatsch <44262898+taniabogatsch@users.noreply.github.com> Date: Tue, 17 Feb 2026 12:53:17 +0100 Subject: [PATCH 2/2] also update the extension 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..183f4cf5 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@main with: extension_name: sqlsmith - duckdb_version: v1.4.0 - ci_tools_version: v1.4.0 + duckdb_version: v1.5-variegata + 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.0 + uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main secrets: inherit with: extension_name: sqlsmith - duckdb_version: v1.4.0 - ci_tools_version: v1.4.0 + duckdb_version: v1.5-variegata + ci_tools_version: main exclude_archs: '' deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}