agent_patch
runs/2026-02-28__18-27-22__gpt-5-4/flux-pr-1649/flux-pr-1649.1-of-1.2026-02-28__18-27-22__gpt-5-4/agent-logs/agent.patch
10577 bytes
diff --git a/tmp/agent-patch-flux-pr-1649.1-of-1.2026-02-28__18-27-22__gpt-5-4/app/src/ast/helpers/stmt_create_table.rs b/app/src/ast/helpers/stmt_create_table.rs
index 364969c..2a0663b 100644
--- a/tmp/agent-patch-flux-pr-1649.1-of-1.2026-02-28__18-27-22__gpt-5-4/app/src/ast/helpers/stmt_create_table.rs
+++ b/app/src/ast/helpers/stmt_create_table.rs
@@ -548,7 +548,10 @@ mod tests {
#[test]
pub fn test_from_invalid_statement() {
- let stmt = Statement::Commit { chain: false };
+ let stmt = Statement::Commit {
+ chain: false,
+ modifier: None,
+ };
assert_eq!(
CreateTableBuilder::try_from(stmt).unwrap_err(),
diff --git a/tmp/agent-patch-flux-pr-1649.1-of-1.2026-02-28__18-27-22__gpt-5-4/app/src/ast/mod.rs b/app/src/ast/mod.rs
index 6d0ef42..9b2c0c3 100644
--- a/tmp/agent-patch-flux-pr-1649.1-of-1.2026-02-28__18-27-22__gpt-5-4/app/src/ast/mod.rs
+++ b/app/src/ast/mod.rs
@@ -2958,7 +2958,8 @@ pub enum Statement {
modes: Vec<TransactionMode>,
begin: bool,
transaction: Option<BeginTransactionKind>,
- /// Only for SQLite
+ /// Dialect-specific `BEGIN` modifiers such as SQLite's transaction
+ /// modes or MS-SQL's `TRY` / `CATCH`.
modifier: Option<TransactionModifier>,
},
/// ```sql
@@ -2985,7 +2986,10 @@ pub enum Statement {
/// ```sql
/// COMMIT [ TRANSACTION | WORK ] [ AND [ NO ] CHAIN ]
/// ```
- Commit { chain: bool },
+ Commit {
+ chain: bool,
+ modifier: Option<TransactionModifier>,
+ },
/// ```sql
/// ROLLBACK [ TRANSACTION | WORK ] [ AND [ NO ] CHAIN ] [ TO [ SAVEPOINT ] savepoint_name ]
/// ```
@@ -4614,8 +4618,12 @@ impl fmt::Display for Statement {
}
Ok(())
}
- Statement::Commit { chain } => {
- write!(f, "COMMIT{}", if *chain { " AND CHAIN" } else { "" },)
+ Statement::Commit { chain, modifier } => {
+ if let Some(modifier) = modifier {
+ write!(f, "END {modifier}")
+ } else {
+ write!(f, "COMMIT{}", if *chain { " AND CHAIN" } else { "" },)
+ }
}
Statement::Rollback { chain, savepoint } => {
write!(f, "ROLLBACK")?;
@@ -6388,9 +6396,7 @@ impl fmt::Display for TransactionIsolationLevel {
}
}
-/// SQLite specific syntax
-///
-/// <https://sqlite.org/lang_transaction.html>
+/// Dialect-specific `BEGIN` / `END` block modifiers.
#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
@@ -6398,6 +6404,8 @@ pub enum TransactionModifier {
Deferred,
Immediate,
Exclusive,
+ Try,
+ Catch,
}
impl fmt::Display for TransactionModifier {
@@ -6407,6 +6415,8 @@ impl fmt::Display for TransactionModifier {
Deferred => "DEFERRED",
Immediate => "IMMEDIATE",
Exclusive => "EXCLUSIVE",
+ Try => "TRY",
+ Catch => "CATCH",
})
}
}
diff --git a/tmp/agent-patch-flux-pr-1649.1-of-1.2026-02-28__18-27-22__gpt-5-4/app/src/keywords.rs b/app/src/keywords.rs
index c8f3cba..1150983 100644
--- a/tmp/agent-patch-flux-pr-1649.1-of-1.2026-02-28__18-27-22__gpt-5-4/app/src/keywords.rs
+++ b/app/src/keywords.rs
@@ -150,6 +150,7 @@ define_keywords!(
CASCADED,
CASE,
CAST,
+ CATCH,
CATALOG,
CEIL,
CEILING,
@@ -812,6 +813,7 @@ define_keywords!(
TRIM_ARRAY,
TRUE,
TRUNCATE,
+ TRY,
TRY_CAST,
TRY_CONVERT,
TUPLE,
diff --git a/tmp/agent-patch-flux-pr-1649.1-of-1.2026-02-28__18-27-22__gpt-5-4/app/src/parser/mod.rs b/app/src/parser/mod.rs
index 95413a8..94b823e 100644
--- a/tmp/agent-patch-flux-pr-1649.1-of-1.2026-02-28__18-27-22__gpt-5-4/app/src/parser/mod.rs
+++ b/app/src/parser/mod.rs
@@ -475,7 +475,14 @@ impl<'a> Parser<'a> {
// end of statement
Token::Word(word) => {
- if expecting_statement_delimiter && word.keyword == Keyword::END {
+ if expecting_statement_delimiter
+ && word.keyword == Keyword::END
+ && !matches!(
+ &self.peek_nth_token_ref(1).token,
+ Token::Word(next_word)
+ if matches!(next_word.keyword, Keyword::TRY | Keyword::CATCH)
+ )
+ {
break;
}
}
@@ -12793,7 +12800,7 @@ impl<'a> Parser<'a> {
pub fn parse_begin(&mut self) -> Result<Statement, ParserError> {
let modifier = if !self.dialect.supports_start_transaction_modifier() {
- None
+ self.parse_try_catch_transaction_modifier()
} else if self.parse_keyword(Keyword::DEFERRED) {
Some(TransactionModifier::Deferred)
} else if self.parse_keyword(Keyword::IMMEDIATE) {
@@ -12801,7 +12808,7 @@ impl<'a> Parser<'a> {
} else if self.parse_keyword(Keyword::EXCLUSIVE) {
Some(TransactionModifier::Exclusive)
} else {
- None
+ self.parse_try_catch_transaction_modifier()
};
let transaction = match self.parse_one_of_keywords(&[Keyword::TRANSACTION, Keyword::WORK]) {
Some(Keyword::TRANSACTION) => Some(BeginTransactionKind::Transaction),
@@ -12817,8 +12824,14 @@ impl<'a> Parser<'a> {
}
pub fn parse_end(&mut self) -> Result<Statement, ParserError> {
+ let modifier = self.parse_try_catch_transaction_modifier();
Ok(Statement::Commit {
- chain: self.parse_commit_rollback_chain()?,
+ chain: if modifier.is_none() {
+ self.parse_commit_rollback_chain()?
+ } else {
+ false
+ },
+ modifier,
})
}
@@ -12861,9 +12874,20 @@ impl<'a> Parser<'a> {
pub fn parse_commit(&mut self) -> Result<Statement, ParserError> {
Ok(Statement::Commit {
chain: self.parse_commit_rollback_chain()?,
+ modifier: None,
})
}
+ fn parse_try_catch_transaction_modifier(&mut self) -> Option<TransactionModifier> {
+ if self.parse_keyword(Keyword::TRY) {
+ Some(TransactionModifier::Try)
+ } else if self.parse_keyword(Keyword::CATCH) {
+ Some(TransactionModifier::Catch)
+ } else {
+ None
+ }
+ }
+
pub fn parse_rollback(&mut self) -> Result<Statement, ParserError> {
let chain = self.parse_commit_rollback_chain()?;
let savepoint = self.parse_rollback_savepoint()?;
diff --git a/tmp/agent-patch-flux-pr-1649.1-of-1.2026-02-28__18-27-22__gpt-5-4/app/tests/sqlparser_common.rs b/app/tests/sqlparser_common.rs
index b47159d..eb0f6a0 100644
--- a/tmp/agent-patch-flux-pr-1649.1-of-1.2026-02-28__18-27-22__gpt-5-4/app/tests/sqlparser_common.rs
+++ b/app/tests/sqlparser_common.rs
@@ -7853,6 +7853,8 @@ fn parse_start_transaction() {
verified_stmt("BEGIN");
verified_stmt("BEGIN WORK");
verified_stmt("BEGIN TRANSACTION");
+ one_statement_parses_to("BEGIN TRY", "BEGIN TRY");
+ one_statement_parses_to("BEGIN CATCH", "BEGIN CATCH");
verified_stmt("START TRANSACTION ISOLATION LEVEL READ UNCOMMITTED");
verified_stmt("START TRANSACTION ISOLATION LEVEL READ COMMITTED");
@@ -8102,12 +8104,18 @@ fn parse_set_time_zone_alias() {
#[test]
fn parse_commit() {
match verified_stmt("COMMIT") {
- Statement::Commit { chain: false } => (),
+ Statement::Commit {
+ chain: false,
+ modifier: None,
+ } => (),
_ => unreachable!(),
}
match verified_stmt("COMMIT AND CHAIN") {
- Statement::Commit { chain: true } => (),
+ Statement::Commit {
+ chain: true,
+ modifier: None,
+ } => (),
_ => unreachable!(),
}
@@ -8122,6 +8130,24 @@ fn parse_commit() {
#[test]
fn parse_end() {
+ match verified_stmt("END TRY") {
+ Statement::Commit {
+ chain: false,
+ modifier: Some(TransactionModifier::Try),
+ } => (),
+ _ => unreachable!(),
+ }
+
+ match verified_stmt("END CATCH") {
+ Statement::Commit {
+ chain: false,
+ modifier: Some(TransactionModifier::Catch),
+ } => (),
+ _ => unreachable!(),
+ }
+
+ one_statement_parses_to("END TRY", "END TRY");
+ one_statement_parses_to("END CATCH", "END CATCH");
one_statement_parses_to("END AND NO CHAIN", "COMMIT");
one_statement_parses_to("END WORK AND NO CHAIN", "COMMIT");
one_statement_parses_to("END TRANSACTION AND NO CHAIN", "COMMIT");
diff --git a/tmp/agent-patch-flux-pr-1649.1-of-1.2026-02-28__18-27-22__gpt-5-4/app/tests/sqlparser_custom_dialect.rs b/app/tests/sqlparser_custom_dialect.rs
index e9ca82a..5ee6282 100644
--- a/tmp/agent-patch-flux-pr-1649.1-of-1.2026-02-28__18-27-22__gpt-5-4/app/tests/sqlparser_custom_dialect.rs
+++ b/app/tests/sqlparser_custom_dialect.rs
@@ -115,7 +115,10 @@ fn custom_statement_parser() -> Result<(), ParserError> {
for _ in 0..3 {
let _ = parser.next_token();
}
- Some(Ok(Statement::Commit { chain: false }))
+ Some(Ok(Statement::Commit {
+ chain: false,
+ modifier: None,
+ }))
} else {
None
}
diff --git a/tmp/agent-patch-flux-pr-1649.1-of-1.2026-02-28__18-27-22__gpt-5-4/app/tests/sqlparser_mssql.rs b/app/tests/sqlparser_mssql.rs
index ecc874a..3d7007d 100644
--- a/tmp/agent-patch-flux-pr-1649.1-of-1.2026-02-28__18-27-22__gpt-5-4/app/tests/sqlparser_mssql.rs
+++ b/app/tests/sqlparser_mssql.rs
@@ -183,6 +183,9 @@ fn parse_mssql_create_procedure() {
let _ = ms().verified_stmt("CREATE PROCEDURE [foo] AS BEGIN SELECT [foo], CASE WHEN [foo] IS NULL THEN 'empty' ELSE 'notempty' END AS [foo] END");
// Multiple statements
let _ = ms().verified_stmt("CREATE PROCEDURE [foo] AS BEGIN UPDATE bar SET col = 'test'; SELECT [foo] FROM BAR WHERE [FOO] > 10 END");
+ let _ = ms().verified_stmt(
+ "CREATE PROCEDURE foo AS BEGIN BEGIN TRY; SELECT 1; END TRY; BEGIN CATCH; SELECT 2; END CATCH END",
+ );
}
#[test]