Fix parsing EXECUTE (...) with a more general string expression#2295

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

Merged
yoavcloud merged 1 commit into from
Apr 9, 2026
Merged

Fix parsing EXECUTE (...) with a more general string expression #2295

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions src/ast/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4456,7 +4456,7 @@ pub enum Statement {
name: Option<ObjectName>,
/// Parameter expressions passed to execute.
parameters: Vec<Expr>,
/// Whether parentheses were present.
/// Whether parentheses were present around `parameters`.
has_parentheses: bool,
/// Is this an `EXECUTE IMMEDIATE`.
immediate: bool,
Expand DownExpand Up@@ -5911,7 +5911,8 @@ impl fmt::Display for Statement {
default,
} => {
let (open, close) = if *has_parentheses {
("(", ")")
// Space before `(` only when there is no name directly preceding it.
(if name.is_some() { "(" } else { " (" }, ")")
} else {
(if parameters.is_empty() { "" } else { " " }, "")
};
Expand Down
42 changes: 13 additions & 29 deletions src/parser/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18881,31 +18881,21 @@ impl<'a> Parser<'a> {

/// Parse a SQL `EXECUTE` statement
pub fn parse_execute(&mut self) -> Result<Statement, ParserError> {
// Track whether the procedure/expression name itself was wrapped in parens,
// i.e. `EXEC (@sql)` (dynamic string execution) vs `EXEC sp_name`.
// When the name has parens there are no additional parameters.
let name = if self.dialect.supports_execute_immediate()
&& self.parse_keyword(Keyword::IMMEDIATE)
{
let immediate =
self.dialect.supports_execute_immediate() && self.parse_keyword(Keyword::IMMEDIATE);

// When `EXEC` is immediately followed by `(`, the content is a dynamic-SQL
// expression — e.g. `EXEC (@sql)`, `EXEC ('SELECT ...')`, or
// `EXEC ('SELECT ... FROM ' + @tbl + ' WHERE ...')`.
// Skip name parsing; the expression ends up in `parameters` via the
// `has_parentheses` path below, consistent with `EXECUTE IMMEDIATE <expr>`.
let name = if immediate || matches!(self.peek_token_ref().token, Token::LParen) {
None
} else {
let has_parentheses = self.consume_token(&Token::LParen);
let name = self.parse_object_name(false)?;
if has_parentheses {
self.expect_token(&Token::RParen)?;
}
Some((name, has_parentheses))
Some(self.parse_object_name(false)?)
};

let name_had_parentheses = name.as_ref().map(|(_, p)| *p).unwrap_or(false);

// Only look for a parameter list when the name was NOT wrapped in parens.
// `EXEC (@sql)` is dynamic SQL execution and takes no parameters here.
let has_parentheses = if name_had_parentheses {
false
} else {
self.consume_token(&Token::LParen)
};
let has_parentheses = self.consume_token(&Token::LParen);

let end_kws = &[Keyword::USING, Keyword::OUTPUT, Keyword::DEFAULT];
let end_token = match (has_parentheses, self.peek_token().token) {
Expand All@@ -18915,18 +18905,12 @@ impl<'a> Parser<'a> {
(false, _) => Token::SemiColon,
};

let parameters = if name_had_parentheses {
vec![]
} else {
self.parse_comma_separated0(Parser::parse_expr, end_token)?
};
let parameters = self.parse_comma_separated0(Parser::parse_expr, end_token)?;

if has_parentheses {
self.expect_token(&Token::RParen)?;
}

let name = name.map(|(n, _)| n);

let into = if self.parse_keyword(Keyword::INTO) {
self.parse_comma_separated(Self::parse_identifier)?
} else {
Expand All@@ -18944,7 +18928,7 @@ impl<'a> Parser<'a> {
let default = self.parse_keyword(Keyword::DEFAULT);

Ok(Statement::Execute {
immediate: name.is_none(),
immediate,
name,
parameters,
has_parentheses,
Expand Down
4 changes: 2 additions & 2 deletions tests/sqlparser_common.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12294,8 +12294,8 @@ fn parse_execute_stored_procedure() {
}
_ => unreachable!(),
}
// Test optional parentheses around procedure name
ms_and_generic().one_statement_parses_to("EXEC ('name')", "EXECUTE 'name'");
// Parenthesised form is dynamic SQL; the expression ends up in parameters.
ms_and_generic().one_statement_parses_to("EXEC ('name')", "EXECUTE ('name')");
}

#[test]
Expand Down
14 changes: 14 additions & 0 deletions tests/sqlparser_mssql.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2819,6 +2819,20 @@ fn test_exec_dynamic_sql() {
assert_eq!(stmts.len(), 2);
}

#[test]
fn test_exec_dynamic_sql_string_concat() {
// EXEC with string concatenation: EXEC ('...' + @var + '...')
let stmts = tsql()
.parse_sql_statements("EXEC ('SELECT * FROM ' + @TableName + ' WHERE 1=1')")
.expect("EXEC with string concatenation should parse");
assert_eq!(stmts.len(), 1);
assert!(
matches!(&stmts[0], Statement::Execute { .. }),
"expected Execute, got: {:?}",
stmts[0]
);
}

// MSSQL OUTPUT clause on INSERT/UPDATE/DELETE
// https://learn.microsoft.com/en-us/sql/t-sql/queries/output-clause-transact-sql
#[test]
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix parsing EXECUTE (...) with a more general string expression#2295

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

 Merged

yoavcloud
merged 1 commit into

from

Apr 9, 2026
 Merged


Fix parsing EXECUTE (...) with a more general string expression
#2295
Show file tree
Hide file tree
 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


5 changes: 3 additions & 2 deletions
src/ast/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4456,7 +4456,7 @@ pub enum Statement {
 name: Option<ObjectName>,
 /// Parameter expressions passed to execute.
 parameters: Vec<Expr>,
 /// Whether parentheses were present.
 /// Whether parentheses were present around `parameters`.
 has_parentheses: bool,
 /// Is this an `EXECUTE IMMEDIATE`.
 immediate: bool,
Expand DownExpand Up@@ -5911,7 +5911,8 @@ impl fmt::Display for Statement {
 default,
 } => {
 let (open, close) = if *has_parentheses {
 ("(", ")")
 // Space before `(` only when there is no name directly preceding it.
 (if name.is_some() { "(" } else { " (" }, ")")
 } else {
 (if parameters.is_empty() { "" } else { " " }, "")
 };
Expand Down

42 changes: 13 additions & 29 deletions
src/parser/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18881,31 +18881,21 @@ impl<'a> Parser<'a> {

 /// Parse a SQL `EXECUTE` statement
 pub fn parse_execute(&mut self) -> Result<Statement, ParserError> {
 // Track whether the procedure/expression name itself was wrapped in parens,
 // i.e. `EXEC (@sql)` (dynamic string execution) vs `EXEC sp_name`.
 // When the name has parens there are no additional parameters.
 let name = if self.dialect.supports_execute_immediate()
 && self.parse_keyword(Keyword::IMMEDIATE)
 {
 let immediate =
 self.dialect.supports_execute_immediate() && self.parse_keyword(Keyword::IMMEDIATE);

 // When `EXEC` is immediately followed by `(`, the content is a dynamic-SQL
 // expression — e.g. `EXEC (@sql)`, `EXEC ('SELECT ...')`, or
 // `EXEC ('SELECT ... FROM ' + @tbl + ' WHERE ...')`.
 // Skip name parsing; the expression ends up in `parameters` via the
 // `has_parentheses` path below, consistent with `EXECUTE IMMEDIATE <expr>`.
 let name = if immediate || matches!(self.peek_token_ref().token, Token::LParen) {
 None
 } else {
 let has_parentheses = self.consume_token(&Token::LParen);
 let name = self.parse_object_name(false)?;
 if has_parentheses {
 self.expect_token(&Token::RParen)?;
 }
 Some((name, has_parentheses))
 Some(self.parse_object_name(false)?)
 };

 let name_had_parentheses = name.as_ref().map(|(_, p)| *p).unwrap_or(false);

 // Only look for a parameter list when the name was NOT wrapped in parens.
 // `EXEC (@sql)` is dynamic SQL execution and takes no parameters here.
 let has_parentheses = if name_had_parentheses {
 false
 } else {
 self.consume_token(&Token::LParen)
 };
 let has_parentheses = self.consume_token(&Token::LParen);

 let end_kws = &[Keyword::USING, Keyword::OUTPUT, Keyword::DEFAULT];
 let end_token = match (has_parentheses, self.peek_token().token) {
Expand All@@ -18915,18 +18905,12 @@ impl<'a> Parser<'a> {
 (false, _) => Token::SemiColon,
 };

 let parameters = if name_had_parentheses {
 vec![]
 } else {
 self.parse_comma_separated0(Parser::parse_expr, end_token)?
 };
 let parameters = self.parse_comma_separated0(Parser::parse_expr, end_token)?;

 if has_parentheses {
 self.expect_token(&Token::RParen)?;
 }

 let name = name.map(|(n, _)| n);

 let into = if self.parse_keyword(Keyword::INTO) {
 self.parse_comma_separated(Self::parse_identifier)?
 } else {
Expand All@@ -18944,7 +18928,7 @@ impl<'a> Parser<'a> {
 let default = self.parse_keyword(Keyword::DEFAULT);

 Ok(Statement::Execute {
 immediate: name.is_none(),
 immediate,
 name,
 parameters,
 has_parentheses,
Expand Down

4 changes: 2 additions & 2 deletions
tests/sqlparser_common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12294,8 +12294,8 @@ fn parse_execute_stored_procedure() {
 }
 _ => unreachable!(),
 }
 // Test optional parentheses around procedure name
 ms_and_generic().one_statement_parses_to("EXEC ('name')", "EXECUTE 'name'");
 // Parenthesised form is dynamic SQL; the expression ends up in parameters.
 ms_and_generic().one_statement_parses_to("EXEC ('name')", "EXECUTE ('name')");
}

#[test]
Expand Down

14 changes: 14 additions & 0 deletions
tests/sqlparser_mssql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2819,6 +2819,20 @@ fn test_exec_dynamic_sql() {
 assert_eq!(stmts.len(), 2);
}

#[test]
fn test_exec_dynamic_sql_string_concat() {
 // EXEC with string concatenation: EXEC ('...' + @var + '...')
 let stmts = tsql()
 .parse_sql_statements("EXEC ('SELECT * FROM ' + @TableName + ' WHERE 1=1')")
 .expect("EXEC with string concatenation should parse");
 assert_eq!(stmts.len(), 1);
 assert!(
 matches!(&stmts[0], Statement::Execute { .. }),
 "expected Execute, got: {:?}",
 stmts[0]
 );
}

// MSSQL OUTPUT clause on INSERT/UPDATE/DELETE
// https://learn.microsoft.com/en-us/sql/t-sql/queries/output-clause-transact-sql
#[test]
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix parsing EXECUTE (...) with a more general string expression#2295

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

 Merged

yoavcloud
merged 1 commit into

from

Apr 9, 2026
 Merged


Fix parsing EXECUTE (...) with a more general string expression
#2295
Show file tree
Hide file tree
 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


5 changes: 3 additions & 2 deletions
src/ast/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4456,7 +4456,7 @@ pub enum Statement {
 name: Option<ObjectName>,
 /// Parameter expressions passed to execute.
 parameters: Vec<Expr>,
 /// Whether parentheses were present.
 /// Whether parentheses were present around `parameters`.
 has_parentheses: bool,
 /// Is this an `EXECUTE IMMEDIATE`.
 immediate: bool,
Expand DownExpand Up@@ -5911,7 +5911,8 @@ impl fmt::Display for Statement {
 default,
 } => {
 let (open, close) = if *has_parentheses {
 ("(", ")")
 // Space before `(` only when there is no name directly preceding it.
 (if name.is_some() { "(" } else { " (" }, ")")
 } else {
 (if parameters.is_empty() { "" } else { " " }, "")
 };
Expand Down

42 changes: 13 additions & 29 deletions
src/parser/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18881,31 +18881,21 @@ impl<'a> Parser<'a> {

 /// Parse a SQL `EXECUTE` statement
 pub fn parse_execute(&mut self) -> Result<Statement, ParserError> {
 // Track whether the procedure/expression name itself was wrapped in parens,
 // i.e. `EXEC (@sql)` (dynamic string execution) vs `EXEC sp_name`.
 // When the name has parens there are no additional parameters.
 let name = if self.dialect.supports_execute_immediate()
 && self.parse_keyword(Keyword::IMMEDIATE)
 {
 let immediate =
 self.dialect.supports_execute_immediate() && self.parse_keyword(Keyword::IMMEDIATE);

 // When `EXEC` is immediately followed by `(`, the content is a dynamic-SQL
 // expression — e.g. `EXEC (@sql)`, `EXEC ('SELECT ...')`, or
 // `EXEC ('SELECT ... FROM ' + @tbl + ' WHERE ...')`.
 // Skip name parsing; the expression ends up in `parameters` via the
 // `has_parentheses` path below, consistent with `EXECUTE IMMEDIATE <expr>`.
 let name = if immediate || matches!(self.peek_token_ref().token, Token::LParen) {
 None
 } else {
 let has_parentheses = self.consume_token(&Token::LParen);
 let name = self.parse_object_name(false)?;
 if has_parentheses {
 self.expect_token(&Token::RParen)?;
 }
 Some((name, has_parentheses))
 Some(self.parse_object_name(false)?)
 };

 let name_had_parentheses = name.as_ref().map(|(_, p)| *p).unwrap_or(false);

 // Only look for a parameter list when the name was NOT wrapped in parens.
 // `EXEC (@sql)` is dynamic SQL execution and takes no parameters here.
 let has_parentheses = if name_had_parentheses {
 false
 } else {
 self.consume_token(&Token::LParen)
 };
 let has_parentheses = self.consume_token(&Token::LParen);

 let end_kws = &[Keyword::USING, Keyword::OUTPUT, Keyword::DEFAULT];
 let end_token = match (has_parentheses, self.peek_token().token) {
Expand All@@ -18915,18 +18905,12 @@ impl<'a> Parser<'a> {
 (false, _) => Token::SemiColon,
 };

 let parameters = if name_had_parentheses {
 vec![]
 } else {
 self.parse_comma_separated0(Parser::parse_expr, end_token)?
 };
 let parameters = self.parse_comma_separated0(Parser::parse_expr, end_token)?;

 if has_parentheses {
 self.expect_token(&Token::RParen)?;
 }

 let name = name.map(|(n, _)| n);

 let into = if self.parse_keyword(Keyword::INTO) {
 self.parse_comma_separated(Self::parse_identifier)?
 } else {
Expand All@@ -18944,7 +18928,7 @@ impl<'a> Parser<'a> {
 let default = self.parse_keyword(Keyword::DEFAULT);

 Ok(Statement::Execute {
 immediate: name.is_none(),
 immediate,
 name,
 parameters,
 has_parentheses,
Expand Down

4 changes: 2 additions & 2 deletions
tests/sqlparser_common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12294,8 +12294,8 @@ fn parse_execute_stored_procedure() {
 }
 _ => unreachable!(),
 }
 // Test optional parentheses around procedure name
 ms_and_generic().one_statement_parses_to("EXEC ('name')", "EXECUTE 'name'");
 // Parenthesised form is dynamic SQL; the expression ends up in parameters.
 ms_and_generic().one_statement_parses_to("EXEC ('name')", "EXECUTE ('name')");
}

#[test]
Expand Down

14 changes: 14 additions & 0 deletions
tests/sqlparser_mssql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2819,6 +2819,20 @@ fn test_exec_dynamic_sql() {
 assert_eq!(stmts.len(), 2);
}

#[test]
fn test_exec_dynamic_sql_string_concat() {
 // EXEC with string concatenation: EXEC ('...' + @var + '...')
 let stmts = tsql()
 .parse_sql_statements("EXEC ('SELECT * FROM ' + @TableName + ' WHERE 1=1')")
 .expect("EXEC with string concatenation should parse");
 assert_eq!(stmts.len(), 1);
 assert!(
 matches!(&stmts[0], Statement::Execute { .. }),
 "expected Execute, got: {:?}",
 stmts[0]
 );
}

// MSSQL OUTPUT clause on INSERT/UPDATE/DELETE
// https://learn.microsoft.com/en-us/sql/t-sql/queries/output-clause-transact-sql
#[test]
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix parsing EXECUTE (...) with a more general string expression#2295

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

 Merged

yoavcloud
merged 1 commit into

from

Apr 9, 2026
 Merged


Fix parsing EXECUTE (...) with a more general string expression
#2295
Show file tree
Hide file tree
 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


5 changes: 3 additions & 2 deletions
src/ast/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4456,7 +4456,7 @@ pub enum Statement {
 name: Option<ObjectName>,
 /// Parameter expressions passed to execute.
 parameters: Vec<Expr>,
 /// Whether parentheses were present.
 /// Whether parentheses were present around `parameters`.
 has_parentheses: bool,
 /// Is this an `EXECUTE IMMEDIATE`.
 immediate: bool,
Expand DownExpand Up@@ -5911,7 +5911,8 @@ impl fmt::Display for Statement {
 default,
 } => {
 let (open, close) = if *has_parentheses {
 ("(", ")")
 // Space before `(` only when there is no name directly preceding it.
 (if name.is_some() { "(" } else { " (" }, ")")
 } else {
 (if parameters.is_empty() { "" } else { " " }, "")
 };
Expand Down

42 changes: 13 additions & 29 deletions
src/parser/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18881,31 +18881,21 @@ impl<'a> Parser<'a> {

 /// Parse a SQL `EXECUTE` statement
 pub fn parse_execute(&mut self) -> Result<Statement, ParserError> {
 // Track whether the procedure/expression name itself was wrapped in parens,
 // i.e. `EXEC (@sql)` (dynamic string execution) vs `EXEC sp_name`.
 // When the name has parens there are no additional parameters.
 let name = if self.dialect.supports_execute_immediate()
 && self.parse_keyword(Keyword::IMMEDIATE)
 {
 let immediate =
 self.dialect.supports_execute_immediate() && self.parse_keyword(Keyword::IMMEDIATE);

 // When `EXEC` is immediately followed by `(`, the content is a dynamic-SQL
 // expression — e.g. `EXEC (@sql)`, `EXEC ('SELECT ...')`, or
 // `EXEC ('SELECT ... FROM ' + @tbl + ' WHERE ...')`.
 // Skip name parsing; the expression ends up in `parameters` via the
 // `has_parentheses` path below, consistent with `EXECUTE IMMEDIATE <expr>`.
 let name = if immediate || matches!(self.peek_token_ref().token, Token::LParen) {
 None
 } else {
 let has_parentheses = self.consume_token(&Token::LParen);
 let name = self.parse_object_name(false)?;
 if has_parentheses {
 self.expect_token(&Token::RParen)?;
 }
 Some((name, has_parentheses))
 Some(self.parse_object_name(false)?)
 };

 let name_had_parentheses = name.as_ref().map(|(_, p)| *p).unwrap_or(false);

 // Only look for a parameter list when the name was NOT wrapped in parens.
 // `EXEC (@sql)` is dynamic SQL execution and takes no parameters here.
 let has_parentheses = if name_had_parentheses {
 false
 } else {
 self.consume_token(&Token::LParen)
 };
 let has_parentheses = self.consume_token(&Token::LParen);

 let end_kws = &[Keyword::USING, Keyword::OUTPUT, Keyword::DEFAULT];
 let end_token = match (has_parentheses, self.peek_token().token) {
Expand All@@ -18915,18 +18905,12 @@ impl<'a> Parser<'a> {
 (false, _) => Token::SemiColon,
 };

 let parameters = if name_had_parentheses {
 vec![]
 } else {
 self.parse_comma_separated0(Parser::parse_expr, end_token)?
 };
 let parameters = self.parse_comma_separated0(Parser::parse_expr, end_token)?;

 if has_parentheses {
 self.expect_token(&Token::RParen)?;
 }

 let name = name.map(|(n, _)| n);

 let into = if self.parse_keyword(Keyword::INTO) {
 self.parse_comma_separated(Self::parse_identifier)?
 } else {
Expand All@@ -18944,7 +18928,7 @@ impl<'a> Parser<'a> {
 let default = self.parse_keyword(Keyword::DEFAULT);

 Ok(Statement::Execute {
 immediate: name.is_none(),
 immediate,
 name,
 parameters,
 has_parentheses,
Expand Down

4 changes: 2 additions & 2 deletions
tests/sqlparser_common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12294,8 +12294,8 @@ fn parse_execute_stored_procedure() {
 }
 _ => unreachable!(),
 }
 // Test optional parentheses around procedure name
 ms_and_generic().one_statement_parses_to("EXEC ('name')", "EXECUTE 'name'");
 // Parenthesised form is dynamic SQL; the expression ends up in parameters.
 ms_and_generic().one_statement_parses_to("EXEC ('name')", "EXECUTE ('name')");
}

#[test]
Expand Down

14 changes: 14 additions & 0 deletions
tests/sqlparser_mssql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2819,6 +2819,20 @@ fn test_exec_dynamic_sql() {
 assert_eq!(stmts.len(), 2);
}

#[test]
fn test_exec_dynamic_sql_string_concat() {
 // EXEC with string concatenation: EXEC ('...' + @var + '...')
 let stmts = tsql()
 .parse_sql_statements("EXEC ('SELECT * FROM ' + @TableName + ' WHERE 1=1')")
 .expect("EXEC with string concatenation should parse");
 assert_eq!(stmts.len(), 1);
 assert!(
 matches!(&stmts[0], Statement::Execute { .. }),
 "expected Execute, got: {:?}",
 stmts[0]
 );
}

// MSSQL OUTPUT clause on INSERT/UPDATE/DELETE
// https://learn.microsoft.com/en-us/sql/t-sql/queries/output-clause-transact-sql
#[test]
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix parsing EXECUTE (...) with a more general string expression#2295

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

 Merged

yoavcloud
merged 1 commit into

from

Apr 9, 2026
 Merged


Fix parsing EXECUTE (...) with a more general string expression
#2295
Show file tree
Hide file tree
 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


5 changes: 3 additions & 2 deletions
src/ast/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4456,7 +4456,7 @@ pub enum Statement {
 name: Option<ObjectName>,
 /// Parameter expressions passed to execute.
 parameters: Vec<Expr>,
 /// Whether parentheses were present.
 /// Whether parentheses were present around `parameters`.
 has_parentheses: bool,
 /// Is this an `EXECUTE IMMEDIATE`.
 immediate: bool,
Expand DownExpand Up@@ -5911,7 +5911,8 @@ impl fmt::Display for Statement {
 default,
 } => {
 let (open, close) = if *has_parentheses {
 ("(", ")")
 // Space before `(` only when there is no name directly preceding it.
 (if name.is_some() { "(" } else { " (" }, ")")
 } else {
 (if parameters.is_empty() { "" } else { " " }, "")
 };
Expand Down

42 changes: 13 additions & 29 deletions
src/parser/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18881,31 +18881,21 @@ impl<'a> Parser<'a> {

 /// Parse a SQL `EXECUTE` statement
 pub fn parse_execute(&mut self) -> Result<Statement, ParserError> {
 // Track whether the procedure/expression name itself was wrapped in parens,
 // i.e. `EXEC (@sql)` (dynamic string execution) vs `EXEC sp_name`.
 // When the name has parens there are no additional parameters.
 let name = if self.dialect.supports_execute_immediate()
 && self.parse_keyword(Keyword::IMMEDIATE)
 {
 let immediate =
 self.dialect.supports_execute_immediate() && self.parse_keyword(Keyword::IMMEDIATE);

 // When `EXEC` is immediately followed by `(`, the content is a dynamic-SQL
 // expression — e.g. `EXEC (@sql)`, `EXEC ('SELECT ...')`, or
 // `EXEC ('SELECT ... FROM ' + @tbl + ' WHERE ...')`.
 // Skip name parsing; the expression ends up in `parameters` via the
 // `has_parentheses` path below, consistent with `EXECUTE IMMEDIATE <expr>`.
 let name = if immediate || matches!(self.peek_token_ref().token, Token::LParen) {
 None
 } else {
 let has_parentheses = self.consume_token(&Token::LParen);
 let name = self.parse_object_name(false)?;
 if has_parentheses {
 self.expect_token(&Token::RParen)?;
 }
 Some((name, has_parentheses))
 Some(self.parse_object_name(false)?)
 };

 let name_had_parentheses = name.as_ref().map(|(_, p)| *p).unwrap_or(false);

 // Only look for a parameter list when the name was NOT wrapped in parens.
 // `EXEC (@sql)` is dynamic SQL execution and takes no parameters here.
 let has_parentheses = if name_had_parentheses {
 false
 } else {
 self.consume_token(&Token::LParen)
 };
 let has_parentheses = self.consume_token(&Token::LParen);

 let end_kws = &[Keyword::USING, Keyword::OUTPUT, Keyword::DEFAULT];
 let end_token = match (has_parentheses, self.peek_token().token) {
Expand All@@ -18915,18 +18905,12 @@ impl<'a> Parser<'a> {
 (false, _) => Token::SemiColon,
 };

 let parameters = if name_had_parentheses {
 vec![]
 } else {
 self.parse_comma_separated0(Parser::parse_expr, end_token)?
 };
 let parameters = self.parse_comma_separated0(Parser::parse_expr, end_token)?;

 if has_parentheses {
 self.expect_token(&Token::RParen)?;
 }

 let name = name.map(|(n, _)| n);

 let into = if self.parse_keyword(Keyword::INTO) {
 self.parse_comma_separated(Self::parse_identifier)?
 } else {
Expand All@@ -18944,7 +18928,7 @@ impl<'a> Parser<'a> {
 let default = self.parse_keyword(Keyword::DEFAULT);

 Ok(Statement::Execute {
 immediate: name.is_none(),
 immediate,
 name,
 parameters,
 has_parentheses,
Expand Down

4 changes: 2 additions & 2 deletions
tests/sqlparser_common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12294,8 +12294,8 @@ fn parse_execute_stored_procedure() {
 }
 _ => unreachable!(),
 }
 // Test optional parentheses around procedure name
 ms_and_generic().one_statement_parses_to("EXEC ('name')", "EXECUTE 'name'");
 // Parenthesised form is dynamic SQL; the expression ends up in parameters.
 ms_and_generic().one_statement_parses_to("EXEC ('name')", "EXECUTE ('name')");
}

#[test]
Expand Down

14 changes: 14 additions & 0 deletions
tests/sqlparser_mssql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2819,6 +2819,20 @@ fn test_exec_dynamic_sql() {
 assert_eq!(stmts.len(), 2);
}

#[test]
fn test_exec_dynamic_sql_string_concat() {
 // EXEC with string concatenation: EXEC ('...' + @var + '...')
 let stmts = tsql()
 .parse_sql_statements("EXEC ('SELECT * FROM ' + @TableName + ' WHERE 1=1')")
 .expect("EXEC with string concatenation should parse");
 assert_eq!(stmts.len(), 1);
 assert!(
 matches!(&stmts[0], Statement::Execute { .. }),
 "expected Execute, got: {:?}",
 stmts[0]
 );
}

// MSSQL OUTPUT clause on INSERT/UPDATE/DELETE
// https://learn.microsoft.com/en-us/sql/t-sql/queries/output-clause-transact-sql
#[test]
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix parsing EXECUTE (...) with a more general string expression#2295

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

 Merged

yoavcloud
merged 1 commit into

from

Apr 9, 2026
 Merged


Fix parsing EXECUTE (...) with a more general string expression
#2295
Show file tree
Hide file tree
 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


5 changes: 3 additions & 2 deletions
src/ast/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4456,7 +4456,7 @@ pub enum Statement {
 name: Option<ObjectName>,
 /// Parameter expressions passed to execute.
 parameters: Vec<Expr>,
 /// Whether parentheses were present.
 /// Whether parentheses were present around `parameters`.
 has_parentheses: bool,
 /// Is this an `EXECUTE IMMEDIATE`.
 immediate: bool,
Expand DownExpand Up@@ -5911,7 +5911,8 @@ impl fmt::Display for Statement {
 default,
 } => {
 let (open, close) = if *has_parentheses {
 ("(", ")")
 // Space before `(` only when there is no name directly preceding it.
 (if name.is_some() { "(" } else { " (" }, ")")
 } else {
 (if parameters.is_empty() { "" } else { " " }, "")
 };
Expand Down

42 changes: 13 additions & 29 deletions
src/parser/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18881,31 +18881,21 @@ impl<'a> Parser<'a> {

 /// Parse a SQL `EXECUTE` statement
 pub fn parse_execute(&mut self) -> Result<Statement, ParserError> {
 // Track whether the procedure/expression name itself was wrapped in parens,
 // i.e. `EXEC (@sql)` (dynamic string execution) vs `EXEC sp_name`.
 // When the name has parens there are no additional parameters.
 let name = if self.dialect.supports_execute_immediate()
 && self.parse_keyword(Keyword::IMMEDIATE)
 {
 let immediate =
 self.dialect.supports_execute_immediate() && self.parse_keyword(Keyword::IMMEDIATE);

 // When `EXEC` is immediately followed by `(`, the content is a dynamic-SQL
 // expression — e.g. `EXEC (@sql)`, `EXEC ('SELECT ...')`, or
 // `EXEC ('SELECT ... FROM ' + @tbl + ' WHERE ...')`.
 // Skip name parsing; the expression ends up in `parameters` via the
 // `has_parentheses` path below, consistent with `EXECUTE IMMEDIATE <expr>`.
 let name = if immediate || matches!(self.peek_token_ref().token, Token::LParen) {
 None
 } else {
 let has_parentheses = self.consume_token(&Token::LParen);
 let name = self.parse_object_name(false)?;
 if has_parentheses {
 self.expect_token(&Token::RParen)?;
 }
 Some((name, has_parentheses))
 Some(self.parse_object_name(false)?)
 };

 let name_had_parentheses = name.as_ref().map(|(_, p)| *p).unwrap_or(false);

 // Only look for a parameter list when the name was NOT wrapped in parens.
 // `EXEC (@sql)` is dynamic SQL execution and takes no parameters here.
 let has_parentheses = if name_had_parentheses {
 false
 } else {
 self.consume_token(&Token::LParen)
 };
 let has_parentheses = self.consume_token(&Token::LParen);

 let end_kws = &[Keyword::USING, Keyword::OUTPUT, Keyword::DEFAULT];
 let end_token = match (has_parentheses, self.peek_token().token) {
Expand All@@ -18915,18 +18905,12 @@ impl<'a> Parser<'a> {
 (false, _) => Token::SemiColon,
 };

 let parameters = if name_had_parentheses {
 vec![]
 } else {
 self.parse_comma_separated0(Parser::parse_expr, end_token)?
 };
 let parameters = self.parse_comma_separated0(Parser::parse_expr, end_token)?;

 if has_parentheses {
 self.expect_token(&Token::RParen)?;
 }

 let name = name.map(|(n, _)| n);

 let into = if self.parse_keyword(Keyword::INTO) {
 self.parse_comma_separated(Self::parse_identifier)?
 } else {
Expand All@@ -18944,7 +18928,7 @@ impl<'a> Parser<'a> {
 let default = self.parse_keyword(Keyword::DEFAULT);

 Ok(Statement::Execute {
 immediate: name.is_none(),
 immediate,
 name,
 parameters,
 has_parentheses,
Expand Down

4 changes: 2 additions & 2 deletions
tests/sqlparser_common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12294,8 +12294,8 @@ fn parse_execute_stored_procedure() {
 }
 _ => unreachable!(),
 }
 // Test optional parentheses around procedure name
 ms_and_generic().one_statement_parses_to("EXEC ('name')", "EXECUTE 'name'");
 // Parenthesised form is dynamic SQL; the expression ends up in parameters.
 ms_and_generic().one_statement_parses_to("EXEC ('name')", "EXECUTE ('name')");
}

#[test]
Expand Down

14 changes: 14 additions & 0 deletions
tests/sqlparser_mssql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2819,6 +2819,20 @@ fn test_exec_dynamic_sql() {
 assert_eq!(stmts.len(), 2);
}

#[test]
fn test_exec_dynamic_sql_string_concat() {
 // EXEC with string concatenation: EXEC ('...' + @var + '...')
 let stmts = tsql()
 .parse_sql_statements("EXEC ('SELECT * FROM ' + @TableName + ' WHERE 1=1')")
 .expect("EXEC with string concatenation should parse");
 assert_eq!(stmts.len(), 1);
 assert!(
 matches!(&stmts[0], Statement::Execute { .. }),
 "expected Execute, got: {:?}",
 stmts[0]
 );
}

// MSSQL OUTPUT clause on INSERT/UPDATE/DELETE
// https://learn.microsoft.com/en-us/sql/t-sql/queries/output-clause-transact-sql
#[test]
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix parsing EXECUTE (...) with a more general string expression#2295

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

 Merged

yoavcloud
merged 1 commit into

from

Apr 9, 2026
 Merged


Fix parsing EXECUTE (...) with a more general string expression
#2295
Show file tree
Hide file tree
 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


5 changes: 3 additions & 2 deletions
src/ast/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4456,7 +4456,7 @@ pub enum Statement {
 name: Option<ObjectName>,
 /// Parameter expressions passed to execute.
 parameters: Vec<Expr>,
 /// Whether parentheses were present.
 /// Whether parentheses were present around `parameters`.
 has_parentheses: bool,
 /// Is this an `EXECUTE IMMEDIATE`.
 immediate: bool,
Expand DownExpand Up@@ -5911,7 +5911,8 @@ impl fmt::Display for Statement {
 default,
 } => {
 let (open, close) = if *has_parentheses {
 ("(", ")")
 // Space before `(` only when there is no name directly preceding it.
 (if name.is_some() { "(" } else { " (" }, ")")
 } else {
 (if parameters.is_empty() { "" } else { " " }, "")
 };
Expand Down

42 changes: 13 additions & 29 deletions
src/parser/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18881,31 +18881,21 @@ impl<'a> Parser<'a> {

 /// Parse a SQL `EXECUTE` statement
 pub fn parse_execute(&mut self) -> Result<Statement, ParserError> {
 // Track whether the procedure/expression name itself was wrapped in parens,
 // i.e. `EXEC (@sql)` (dynamic string execution) vs `EXEC sp_name`.
 // When the name has parens there are no additional parameters.
 let name = if self.dialect.supports_execute_immediate()
 && self.parse_keyword(Keyword::IMMEDIATE)
 {
 let immediate =
 self.dialect.supports_execute_immediate() && self.parse_keyword(Keyword::IMMEDIATE);

 // When `EXEC` is immediately followed by `(`, the content is a dynamic-SQL
 // expression — e.g. `EXEC (@sql)`, `EXEC ('SELECT ...')`, or
 // `EXEC ('SELECT ... FROM ' + @tbl + ' WHERE ...')`.
 // Skip name parsing; the expression ends up in `parameters` via the
 // `has_parentheses` path below, consistent with `EXECUTE IMMEDIATE <expr>`.
 let name = if immediate || matches!(self.peek_token_ref().token, Token::LParen) {
 None
 } else {
 let has_parentheses = self.consume_token(&Token::LParen);
 let name = self.parse_object_name(false)?;
 if has_parentheses {
 self.expect_token(&Token::RParen)?;
 }
 Some((name, has_parentheses))
 Some(self.parse_object_name(false)?)
 };

 let name_had_parentheses = name.as_ref().map(|(_, p)| *p).unwrap_or(false);

 // Only look for a parameter list when the name was NOT wrapped in parens.
 // `EXEC (@sql)` is dynamic SQL execution and takes no parameters here.
 let has_parentheses = if name_had_parentheses {
 false
 } else {
 self.consume_token(&Token::LParen)
 };
 let has_parentheses = self.consume_token(&Token::LParen);

 let end_kws = &[Keyword::USING, Keyword::OUTPUT, Keyword::DEFAULT];
 let end_token = match (has_parentheses, self.peek_token().token) {
Expand All@@ -18915,18 +18905,12 @@ impl<'a> Parser<'a> {
 (false, _) => Token::SemiColon,
 };

 let parameters = if name_had_parentheses {
 vec![]
 } else {
 self.parse_comma_separated0(Parser::parse_expr, end_token)?
 };
 let parameters = self.parse_comma_separated0(Parser::parse_expr, end_token)?;

 if has_parentheses {
 self.expect_token(&Token::RParen)?;
 }

 let name = name.map(|(n, _)| n);

 let into = if self.parse_keyword(Keyword::INTO) {
 self.parse_comma_separated(Self::parse_identifier)?
 } else {
Expand All@@ -18944,7 +18928,7 @@ impl<'a> Parser<'a> {
 let default = self.parse_keyword(Keyword::DEFAULT);

 Ok(Statement::Execute {
 immediate: name.is_none(),
 immediate,
 name,
 parameters,
 has_parentheses,
Expand Down

4 changes: 2 additions & 2 deletions
tests/sqlparser_common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12294,8 +12294,8 @@ fn parse_execute_stored_procedure() {
 }
 _ => unreachable!(),
 }
 // Test optional parentheses around procedure name
 ms_and_generic().one_statement_parses_to("EXEC ('name')", "EXECUTE 'name'");
 // Parenthesised form is dynamic SQL; the expression ends up in parameters.
 ms_and_generic().one_statement_parses_to("EXEC ('name')", "EXECUTE ('name')");
}

#[test]
Expand Down

14 changes: 14 additions & 0 deletions
tests/sqlparser_mssql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2819,6 +2819,20 @@ fn test_exec_dynamic_sql() {
 assert_eq!(stmts.len(), 2);
}

#[test]
fn test_exec_dynamic_sql_string_concat() {
 // EXEC with string concatenation: EXEC ('...' + @var + '...')
 let stmts = tsql()
 .parse_sql_statements("EXEC ('SELECT * FROM ' + @TableName + ' WHERE 1=1')")
 .expect("EXEC with string concatenation should parse");
 assert_eq!(stmts.len(), 1);
 assert!(
 matches!(&stmts[0], Statement::Execute { .. }),
 "expected Execute, got: {:?}",
 stmts[0]
 );
}

// MSSQL OUTPUT clause on INSERT/UPDATE/DELETE
// https://learn.microsoft.com/en-us/sql/t-sql/queries/output-clause-transact-sql
#[test]
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix parsing EXECUTE (...) with a more general string expression#2295

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

 Merged

yoavcloud
merged 1 commit into

from

Apr 9, 2026
 Merged


Fix parsing EXECUTE (...) with a more general string expression
#2295
Show file tree
Hide file tree
 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


5 changes: 3 additions & 2 deletions
src/ast/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4456,7 +4456,7 @@ pub enum Statement {
 name: Option<ObjectName>,
 /// Parameter expressions passed to execute.
 parameters: Vec<Expr>,
 /// Whether parentheses were present.
 /// Whether parentheses were present around `parameters`.
 has_parentheses: bool,
 /// Is this an `EXECUTE IMMEDIATE`.
 immediate: bool,
Expand DownExpand Up@@ -5911,7 +5911,8 @@ impl fmt::Display for Statement {
 default,
 } => {
 let (open, close) = if *has_parentheses {
 ("(", ")")
 // Space before `(` only when there is no name directly preceding it.
 (if name.is_some() { "(" } else { " (" }, ")")
 } else {
 (if parameters.is_empty() { "" } else { " " }, "")
 };
Expand Down

42 changes: 13 additions & 29 deletions
src/parser/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18881,31 +18881,21 @@ impl<'a> Parser<'a> {

 /// Parse a SQL `EXECUTE` statement
 pub fn parse_execute(&mut self) -> Result<Statement, ParserError> {
 // Track whether the procedure/expression name itself was wrapped in parens,
 // i.e. `EXEC (@sql)` (dynamic string execution) vs `EXEC sp_name`.
 // When the name has parens there are no additional parameters.
 let name = if self.dialect.supports_execute_immediate()
 && self.parse_keyword(Keyword::IMMEDIATE)
 {
 let immediate =
 self.dialect.supports_execute_immediate() && self.parse_keyword(Keyword::IMMEDIATE);

 // When `EXEC` is immediately followed by `(`, the content is a dynamic-SQL
 // expression — e.g. `EXEC (@sql)`, `EXEC ('SELECT ...')`, or
 // `EXEC ('SELECT ... FROM ' + @tbl + ' WHERE ...')`.
 // Skip name parsing; the expression ends up in `parameters` via the
 // `has_parentheses` path below, consistent with `EXECUTE IMMEDIATE <expr>`.
 let name = if immediate || matches!(self.peek_token_ref().token, Token::LParen) {
 None
 } else {
 let has_parentheses = self.consume_token(&Token::LParen);
 let name = self.parse_object_name(false)?;
 if has_parentheses {
 self.expect_token(&Token::RParen)?;
 }
 Some((name, has_parentheses))
 Some(self.parse_object_name(false)?)
 };

 let name_had_parentheses = name.as_ref().map(|(_, p)| *p).unwrap_or(false);

 // Only look for a parameter list when the name was NOT wrapped in parens.
 // `EXEC (@sql)` is dynamic SQL execution and takes no parameters here.
 let has_parentheses = if name_had_parentheses {
 false
 } else {
 self.consume_token(&Token::LParen)
 };
 let has_parentheses = self.consume_token(&Token::LParen);

 let end_kws = &[Keyword::USING, Keyword::OUTPUT, Keyword::DEFAULT];
 let end_token = match (has_parentheses, self.peek_token().token) {
Expand All@@ -18915,18 +18905,12 @@ impl<'a> Parser<'a> {
 (false, _) => Token::SemiColon,
 };

 let parameters = if name_had_parentheses {
 vec![]
 } else {
 self.parse_comma_separated0(Parser::parse_expr, end_token)?
 };
 let parameters = self.parse_comma_separated0(Parser::parse_expr, end_token)?;

 if has_parentheses {
 self.expect_token(&Token::RParen)?;
 }

 let name = name.map(|(n, _)| n);

 let into = if self.parse_keyword(Keyword::INTO) {
 self.parse_comma_separated(Self::parse_identifier)?
 } else {
Expand All@@ -18944,7 +18928,7 @@ impl<'a> Parser<'a> {
 let default = self.parse_keyword(Keyword::DEFAULT);

 Ok(Statement::Execute {
 immediate: name.is_none(),
 immediate,
 name,
 parameters,
 has_parentheses,
Expand Down

4 changes: 2 additions & 2 deletions
tests/sqlparser_common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12294,8 +12294,8 @@ fn parse_execute_stored_procedure() {
 }
 _ => unreachable!(),
 }
 // Test optional parentheses around procedure name
 ms_and_generic().one_statement_parses_to("EXEC ('name')", "EXECUTE 'name'");
 // Parenthesised form is dynamic SQL; the expression ends up in parameters.
 ms_and_generic().one_statement_parses_to("EXEC ('name')", "EXECUTE ('name')");
}

#[test]
Expand Down

14 changes: 14 additions & 0 deletions
tests/sqlparser_mssql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2819,6 +2819,20 @@ fn test_exec_dynamic_sql() {
 assert_eq!(stmts.len(), 2);
}

#[test]
fn test_exec_dynamic_sql_string_concat() {
 // EXEC with string concatenation: EXEC ('...' + @var + '...')
 let stmts = tsql()
 .parse_sql_statements("EXEC ('SELECT * FROM ' + @TableName + ' WHERE 1=1')")
 .expect("EXEC with string concatenation should parse");
 assert_eq!(stmts.len(), 1);
 assert!(
 matches!(&stmts[0], Statement::Execute { .. }),
 "expected Execute, got: {:?}",
 stmts[0]
 );
}

// MSSQL OUTPUT clause on INSERT/UPDATE/DELETE
// https://learn.microsoft.com/en-us/sql/t-sql/queries/output-clause-transact-sql
#[test]
Expand Down
Loading