Skip to content

St05 #2491

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

St05 #2491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7c4f95b
fix(st05): repair per-result clone flow and nested CTE regressions
gvozdvmozgu Mar 23, 2026
a2a9047
fix(st05): preserve whitespace after FROM in root rewrites
gvozdvmozgu Mar 23, 2026
af1f87d
test(st05): add regression coverage for UNION branch subqueries
gvozdvmozgu Mar 23, 2026
4f96c6d
fix(st05): support T-SQL WITH-before-INSERT rewrites
gvozdvmozgu Mar 23, 2026
0c58b57
fix(st05): handle nested joined subqueries without unsafe fixes
gvozdvmozgu Mar 23, 2026
0e97458
fix(st05): validate forbid_subquery_in config values
gvozdvmozgu Mar 23, 2026
d53c6d6
fix(st05): preserve ClickHouse expression CTEs during subquery rewrites
gvozdvmozgu Mar 23, 2026
cad2e5e
fix(st05): preserve generated CTE order across LT09 rewrites
gvozdvmozgu Mar 23, 2026
0a938ee
test(st05): move regression coverage to YAML fixtures
gvozdvmozgu Mar 23, 2026
823e053
refactor(st05): harden traversal and identifier handling
gvozdvmozgu Mar 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
9 changes: 8 additions & 1 deletion crates/lib-core/src/parser/segments/from.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,14 @@ impl FromExpressionElementSegment {

let alias_expression = self
.0
.child(const { &SyntaxSet::new(&[SyntaxKind::AliasExpression]) });
.child(const { &SyntaxSet::new(&[SyntaxKind::AliasExpression]) })
.or_else(|| {
self.0
.child(const { &SyntaxSet::new(&[SyntaxKind::Bracketed]) })
.and_then(|bracketed| {
bracketed.child(const { &SyntaxSet::new(&[SyntaxKind::AliasExpression]) })
})
});
if let Some(alias_expression) = alias_expression {
let segment = alias_expression.child(
const {
Expand Down
64 changes: 41 additions & 23 deletions crates/lib-dialects/src/ansi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4707,34 +4707,52 @@ pub fn raw_dialect() -> Dialect {
(
"FromExpressionElementSegment".into(),
NodeMatcher::new(SyntaxKind::FromExpressionElement, |_| {
Sequence::new(vec![
Ref::new("PreTableFunctionKeywordsGrammar")
.optional()
let base_from_expression_element = || {
Sequence::new(vec![
Ref::new("PreTableFunctionKeywordsGrammar")
.optional()
.to_matchable(),
optionally_bracketed(vec![
Ref::new("TableExpressionSegment").to_matchable(),
])
.to_matchable(),
optionally_bracketed(vec![Ref::new("TableExpressionSegment").to_matchable()])
Ref::new("AliasExpressionSegment")
.exclude(one_of(vec![
Ref::new("FromClauseTerminatorGrammar").to_matchable(),
Ref::new("SamplingExpressionSegment").to_matchable(),
Ref::new("JoinLikeClauseGrammar").to_matchable(),
LookaheadExclude::new("WITH", "(").to_matchable(),
]))
.optional()
.to_matchable(),
Sequence::new(vec![
Ref::keyword("WITH").to_matchable(),
Ref::keyword("OFFSET").to_matchable(),
Ref::new("AliasExpressionSegment").to_matchable(),
])
.config(|this| this.optional())
.to_matchable(),
Ref::new("AliasExpressionSegment")
.exclude(one_of(vec![
Ref::new("FromClauseTerminatorGrammar").to_matchable(),
Ref::new("SamplingExpressionSegment").to_matchable(),
Ref::new("JoinLikeClauseGrammar").to_matchable(),
LookaheadExclude::new("WITH", "(").to_matchable(),
]))
.optional()
Ref::new("SamplingExpressionSegment")
.optional()
.to_matchable(),
Ref::new("PostTableExpressionGrammar")
.optional()
.to_matchable(),
])
.to_matchable()
};

one_of(vec![
base_from_expression_element(),
Bracketed::new(vec![
Sequence::new(vec![
base_from_expression_element(),
AnyNumberOf::new(vec![Ref::new("JoinClauseSegment").to_matchable()])
.to_matchable(),
])
.to_matchable(),
Sequence::new(vec![
Ref::keyword("WITH").to_matchable(),
Ref::keyword("OFFSET").to_matchable(),
Ref::new("AliasExpressionSegment").to_matchable(),
])
.config(|this| this.optional())
.to_matchable(),
Ref::new("SamplingExpressionSegment")
.optional()
.to_matchable(),
Ref::new("PostTableExpressionGrammar")
.optional()
.to_matchable(),
])
.to_matchable()
})
Expand Down
Loading
Loading