⚠ This page is served via a proxy. Original site: https://github.com
This service does not collect credentials or authentication data.
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
6 changes: 5 additions & 1 deletion src/ast/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6298,7 +6298,7 @@ impl Display for CascadeOption {
}
}

/// Transaction started with [ TRANSACTION | WORK ]
/// Transaction started with [ TRANSACTION | WORK | TRAN ]
#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
Expand All @@ -6307,13 +6307,17 @@ pub enum BeginTransactionKind {
Transaction,
/// Alternate `WORK` keyword.
Work,
/// MSSQL shorthand `TRAN` keyword.
/// See <https://learn.microsoft.com/en-us/sql/t-sql/language-elements/begin-transaction-transact-sql>
Tran,
}

impl Display for BeginTransactionKind {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self {
BeginTransactionKind::Transaction => write!(f, "TRANSACTION"),
BeginTransactionKind::Work => write!(f, "WORK"),
BeginTransactionKind::Tran => write!(f, "TRAN"),
}
}
}
Expand Down
8 changes: 6 additions & 2 deletions src/dialect/mssql.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,12 @@ impl Dialect for MsSqlDialect {
let is_block = parser
.maybe_parse(|p| {
if p.parse_transaction_modifier().is_some()
|| p.parse_one_of_keywords(&[Keyword::TRANSACTION, Keyword::WORK])
.is_some()
|| p.parse_one_of_keywords(&[
Keyword::TRANSACTION,
Keyword::WORK,
Keyword::TRAN,
])
.is_some()
|| matches!(p.peek_token_ref().token, Token::SemiColon | Token::EOF)
{
p.expected("statement", p.peek_token())
Expand Down
1 change: 1 addition & 0 deletions src/keywords.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1050,6 +1050,7 @@ define_keywords!(
TOTP,
TRACE,
TRAILING,
TRAN,
TRANSACTION,
TRANSIENT,
TRANSLATE,
Expand Down
15 changes: 9 additions & 6 deletions src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18067,11 +18067,14 @@ impl<'a> Parser<'a> {
/// Parse a 'BEGIN' statement
pub fn parse_begin(&mut self) -> Result<Statement, ParserError> {
let modifier = self.parse_transaction_modifier();
let transaction = match self.parse_one_of_keywords(&[Keyword::TRANSACTION, Keyword::WORK]) {
Some(Keyword::TRANSACTION) => Some(BeginTransactionKind::Transaction),
Some(Keyword::WORK) => Some(BeginTransactionKind::Work),
_ => None,
};
let transaction =
match self.parse_one_of_keywords(&[Keyword::TRANSACTION, Keyword::WORK, Keyword::TRAN])
{
Some(Keyword::TRANSACTION) => Some(BeginTransactionKind::Transaction),
Some(Keyword::WORK) => Some(BeginTransactionKind::Work),
Some(Keyword::TRAN) => Some(BeginTransactionKind::Tran),
_ => None,
};
Ok(Statement::StartTransaction {
modes: self.parse_transaction_modes()?,
begin: true,
Expand Down Expand Up @@ -18205,7 +18208,7 @@ impl<'a> Parser<'a> {

/// Parse an optional `AND [NO] CHAIN` clause for `COMMIT` and `ROLLBACK` statements
pub fn parse_commit_rollback_chain(&mut self) -> Result<bool, ParserError> {
let _ = self.parse_one_of_keywords(&[Keyword::TRANSACTION, Keyword::WORK]);
let _ = self.parse_one_of_keywords(&[Keyword::TRANSACTION, Keyword::WORK, Keyword::TRAN]);
if self.parse_keyword(Keyword::AND) {
let chain = !self.parse_keyword(Keyword::NO);
self.expect_keyword_is(Keyword::CHAIN)?;
Expand Down
28 changes: 28 additions & 0 deletions tests/sqlparser_mssql.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2628,3 +2628,31 @@ fn parse_mssql_begin_end_block() {
_ => panic!("Expected StartTransaction, got: {stmt:?}"),
}
}

/// MSSQL supports `TRAN` as shorthand for `TRANSACTION`.
/// See <https://learn.microsoft.com/en-us/sql/t-sql/language-elements/begin-transaction-transact-sql>
#[test]
fn parse_mssql_tran_shorthand() {
// BEGIN TRAN
let sql = "BEGIN TRAN";
let stmt = ms().verified_stmt(sql);
match &stmt {
Statement::StartTransaction {
begin,
transaction,
has_end_keyword,
..
} => {
assert!(begin);
assert_eq!(*transaction, Some(BeginTransactionKind::Tran));
assert!(!has_end_keyword);
}
_ => panic!("Expected StartTransaction, got: {stmt:?}"),
}

// COMMIT TRAN normalizes to COMMIT (same as COMMIT TRANSACTION)
ms().one_statement_parses_to("COMMIT TRAN", "COMMIT");

// ROLLBACK TRAN normalizes to ROLLBACK (same as ROLLBACK TRANSACTION)
ms().one_statement_parses_to("ROLLBACK TRAN", "ROLLBACK");
}
Loading