Skip to content
Open
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
29 changes: 26 additions & 3 deletions src/parser/grammar/expressions.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::parser::syntax_kind::SyntaxKind;
use crate::parser::grammar::common::parse_optional_settings_clause;
use crate::parser::grammar::select::{at_end_of_column_list, at_select_statement, parse_select_statement};
use crate::parser::grammar::select::{at_end_of_column_list, at_select_statement, parse_nested_select_statement};
use crate::parser::grammar::types::parse_column_type;
use crate::parser::interval_unit::IntervalUnit;
use crate::parser::keyword::Keyword;
Expand Down Expand Up @@ -428,7 +428,7 @@ fn parse_in_rhs(p: &mut Parser) {
// Check if it's a subquery
if at_select_statement(p) {
let m = p.start();
parse_select_statement(p);
parse_nested_select_statement(p);
p.complete(m, SyntaxKind::SubqueryExpression);
} else {
parse_expression(p);
Expand Down Expand Up @@ -528,7 +528,7 @@ fn expr_delimited(p: &mut Parser) -> Option<CompletedMarker> {
// Subquery starting with SELECT/FROM/WITH
else if at_select_statement(p) {
let m = p.start();
parse_select_statement(p);
parse_nested_select_statement(p);
p.complete(m, SyntaxKind::SubqueryExpression)
}
// Regular identifier / column reference
Expand Down Expand Up @@ -925,6 +925,29 @@ mod tests {
check_no_errors(&format!("SELECT {}1 + 2{}", "(".repeat(50), ")".repeat(50)));
}

#[test]
fn bounds_deeply_nested_subqueries() {
// Use SELECT * so depth is counted by subquery nesting, not by
// parse_expression_rec on a literal in SELECT 1.
fn nested_subqueries(wrappers: usize) -> String {
let mut sql = "SELECT *".to_string();
for _ in 0..wrappers {
sql = format!("SELECT * FROM ({sql})");
}
sql
}

let deep = nested_subqueries(1001);
let result = parse(&deep);
assert!(
result.errors.iter().any(|e| e.message.contains("nesting depth")),
"expected a nesting-depth error, got: {:?}",
result.errors,
);

check_no_errors(&nested_subqueries(999));
}

#[test]
fn binary_precedence() {
check("SELECT 1 + 2 * 3", expect![[r#"
Expand Down
15 changes: 13 additions & 2 deletions src/parser/grammar/select.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,17 @@ pub fn parse_select_statement(p: &mut Parser) {
}
}

/// Parse a SELECT nested inside parentheses (FROM subquery, CTE, IN, scalar subquery).
pub fn parse_nested_select_statement(p: &mut Parser) {
if p.enter_depth() {
p.advance_with_error("Maximum expression nesting depth exceeded");
p.leave_depth();
return;
}
parse_select_statement(p);
p.leave_depth();
}

/// True if the current position marks the end of a column list
/// (i.e. we've hit a clause keyword or statement boundary).
pub fn at_end_of_column_list(p: &mut Parser) -> bool {
Expand Down Expand Up @@ -297,7 +308,7 @@ fn parse_with_items(p: &mut Parser) {
p.expect(SyntaxKind::OpeningRoundBracket);
if at_select_statement(p) {
let subq = p.start();
parse_select_statement(p);
parse_nested_select_statement(p);
p.complete(subq, SyntaxKind::SubqueryExpression);
} else {
parse_expression(p);
Expand Down Expand Up @@ -513,7 +524,7 @@ fn parse_subquery_table_ref(p: &mut Parser) {
let m = p.start();
p.expect(SyntaxKind::OpeningRoundBracket);
if at_select_statement(p) {
parse_select_statement(p);
parse_nested_select_statement(p);
} else if at_explain_statement(p) {
parse_explain_statement(p);
} else {
Expand Down