Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
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@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' }}
12 changes: 1 addition & 11 deletions src/include/statement_generator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 6 additions & 3 deletions src/statement_generator.cpp
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 Expand Up @@ -467,7 +468,9 @@ unique_ptr<TableRef> StatementGenerator::GenerateBaseTableRef() {
}
case CatalogType::VIEW_ENTRY: {
auto &view = entry.Cast<ViewCatalogEntry>();
column_count = view.types.size();
view.BindView(context);
auto view_columns = view.GetColumnInfo();
column_count = view_columns->types.size();
break;
}
default:
Expand Down
10 changes: 6 additions & 4 deletions src/statement_simplifier.cpp
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