Skip to content

Commit 000fe3f

Browse files
committed
Switch from empty tokens to existing statement enum option
1 parent b25a8d2 commit 000fe3f

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

src/ast/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3802,7 +3802,7 @@ pub enum Statement {
38023802
/// Execute logic block
38033803
exec_body: Option<TriggerExecBody>,
38043804
/// For SQL dialects with statement(s) for a body
3805-
statements: Option<BeginEndStatements>,
3805+
statements: Option<ConditionalStatements>,
38063806
/// The characteristic of the trigger, which include whether the trigger is `DEFERRABLE`, `INITIALLY DEFERRED`, or `INITIALLY IMMEDIATE`,
38073807
characteristics: Option<ConstraintCharacteristics>,
38083808
},

src/dialect/mssql.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,16 +246,14 @@ impl MsSqlDialect {
246246
let statements = parser.parse_statement_list(&[Keyword::END])?;
247247
let end_token = parser.expect_keyword(Keyword::END)?;
248248

249-
BeginEndStatements {
249+
ConditionalStatements::BeginEnd(BeginEndStatements {
250250
begin_token: AttachedToken(begin_token),
251251
statements,
252252
end_token: AttachedToken(end_token),
253-
}
253+
})
254254
} else {
255-
BeginEndStatements {
256-
begin_token: AttachedToken::empty(),
255+
ConditionalStatements::Sequence {
257256
statements: parser.parse_statements()?,
258-
end_token: AttachedToken::empty(),
259257
}
260258
};
261259

tests/sqlparser_mssql.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2234,8 +2234,7 @@ fn parse_create_trigger() {
22342234
include_each: false,
22352235
condition: None,
22362236
exec_body: None,
2237-
statements: Some(BeginEndStatements {
2238-
begin_token: AttachedToken::empty(),
2237+
statements: Some(ConditionalStatements::Sequence {
22392238
statements: vec![Statement::RaisError {
22402239
message: Box::new(Expr::Value(
22412240
(Value::SingleQuotedString("Notify Customer Relations".to_string()))
@@ -2250,7 +2249,6 @@ fn parse_create_trigger() {
22502249
arguments: vec![],
22512250
options: vec![],
22522251
}],
2253-
end_token: AttachedToken::empty(),
22542252
}),
22552253
characteristics: None,
22562254
}

0 commit comments

Comments
 (0)