Skip to content

Apply patches #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tmonster wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Apply patches #64

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8668fb8
apply patches from duckdb v1.5-variegata
maiadegraaf Jan 16, 2026
c3672bb
Merge remote-tracking branch 'upstream/main' into apply-patches-a9cda…
Tmonster Jan 22, 2026
6469809
add includes
Tmonster Jan 23, 2026
3dc962e
bump duckdb
Tmonster Jan 23, 2026
36e60e3
update main distribution pipeline
Tmonster Jan 23, 2026
8a1a186
Update CI workflow to use main branch for tools
Tmonster Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/MainDistributionPipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Copy Markdown
Member

@maiadegraaf maiadegraaf Jan 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this the commit of duckdb where patch is taken from?
Also I think ci_tools_version should be main since v1.5.0 doesn't exist yet (assuming the patch is coming from v1.5-variegata

Copy link
Copy Markdown
Member Author

@Tmonster Tmonster Jan 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea f59749da9cff1eb1d59be8b6449c8d607cac975f is the duckdb commit where it is taken from
I'll update ci_tools_versoin

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' }}
2 changes: 1 addition & 1 deletion duckdb
Open in desktop
Submodule duckdb updated 4057 files
2 changes: 2 additions & 0 deletions src/include/statement_generator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
5 changes: 3 additions & 2 deletions src/statement_generator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,8 +373,9 @@ unique_ptr<QueryNode> StatementGenerator::GenerateQueryNode() {
GenerateCTEs(*setop);
setop->setop_type = Choose<SetOperationType>({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:
Expand Down
10 changes: 6 additions & 4 deletions src/statement_simplifier.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -218,8 +219,9 @@ void StatementSimplifier::Simplify(unique_ptr<QueryNode> &node) {
break;
case QueryNodeType::SET_OPERATION_NODE: {
auto &setop = node->Cast<SetOperationNode>();
SimplifyReplace(node, setop.left);
SimplifyReplace(node, setop.right);
for(auto &child : setop.children) {
SimplifyReplace(node, child);
}
Simplify(setop);
break;
}
Expand Down
Loading