Skip to content

fix: prevent ST05 panic on WITH INSERT subqueries #2040

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: prevent ST05 panic on WITH INSERT subqueries #2040

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 29 additions & 11 deletions crates/lib/src/rules/structure/st05.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,24 +208,17 @@ join c using(x)
}

let _segment = Segments::new(new_root, None);
let output_select = if is_with {
_segment.children(Some(|it: &ErasedSegment| {
matches!(
it.get_type(),
SyntaxKind::SetExpression | SyntaxKind::SelectStatement
)
}))
} else {
_segment.clone()
let Some(target_statement) = resolve_output_statement(&_segment) else {
return lint_results;
};

for result in &mut lint_results {
let subquery_parent = subquery_parent.clone().unwrap();
let output_select_clone = output_select[0].clone();
let output_select_clone = target_statement.clone();

let mut fixes = ctes.ensure_space_after_from(
context.tables,
output_select[0].clone(),
target_statement.clone(),
&output_select_clone,
subquery_parent,
);
Expand Down Expand Up @@ -425,6 +418,31 @@ fn get_first_select_statement_descendant(segment: &ErasedSegment) -> Option<Eras
.next()
}

fn resolve_output_statement(segment: &Segments) -> Option<ErasedSegment> {
let root = segment.first()?.clone();

if root.is_type(SyntaxKind::WithCompoundStatement) {
let statement = segment.children(Some(|it: &ErasedSegment| {
matches!(
it.get_type(),
SyntaxKind::SetExpression
| SyntaxKind::SelectStatement
| SyntaxKind::InsertStatement
| SyntaxKind::UpdateStatement
| SyntaxKind::DeleteStatement
)
}));

if let Some(stmt) = statement.first() {
return Some(stmt.clone());
}

return get_first_select_statement_descendant(&root);
}

Some(root)
}

fn is_correlated_subquery(
nested_select: Segments,
select_source_names: &AHashSet<SmolStr>,
Expand Down