Skip to content

Commit 8780462

Browse files
aharpervcaharpervc
committed
Simplify test fixtures
1 parent e5116bc commit 8780462

File tree

1 file changed

+26
-126
lines changed

1 file changed

+26
-126
lines changed

‎tests/sqlparser_mssql.rs‎

Lines changed: 26 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -198,29 +198,17 @@ fn parse_create_function() {
198198
or_replace: false,
199199
temporary: false,
200200
if_not_exists: false,
201-
name: ObjectName::from(vec![Ident {
202-
value: "some_scalar_udf".into(),
203-
quote_style: None,
204-
span: Span::empty(),
205-
}]),
201+
name: ObjectName::from(vec![Ident::new("some_scalar_udf")]),
206202
args: Some(vec![
207203
OperateFunctionArg {
208204
mode: None,
209-
name: Some(Ident {
210-
value: "@foo".into(),
211-
quote_style: None,
212-
span: Span::empty(),
213-
}),
205+
name: Some(Ident::new("@foo")),
214206
data_type: DataType::Int(None),
215207
default_expr: None,
216208
},
217209
OperateFunctionArg {
218210
mode: None,
219-
name: Some(Ident {
220-
value: "@bar".into(),
221-
quote_style: None,
222-
span: Span::empty(),
223-
}),
211+
name: Some(Ident::new("@bar")),
224212
data_type: DataType::Varchar(Some(CharacterLength::IntegerLength {
225213
length: 256,
226214
unit: None
@@ -230,25 +218,13 @@ fn parse_create_function() {
230218
]),
231219
return_type: Some(DataType::Int(None)),
232220
function_body: Some(CreateFunctionBody::AsBeginEnd(BeginEndStatements {
233-
begin_token: AttachedToken(TokenWithSpan::wrap(sqlparser::tokenizer::Token::Word(
234-
sqlparser::tokenizer::Word {
235-
value: "BEGIN".to_string(),
236-
quote_style: None,
237-
keyword: Keyword::BEGIN
238-
}
239-
))),
221+
begin_token: AttachedToken::empty(),
240222
statements: vec![Statement::Return(ReturnStatement {
241223
value: Some(ReturnStatementValue::Expr(Expr::Value(
242224
(number("1")).with_empty_span()
243225
))),
244226
}),],
245-
end_token: AttachedToken(TokenWithSpan::wrap(sqlparser::tokenizer::Token::Word(
246-
sqlparser::tokenizer::Word {
247-
value: "END".to_string(),
248-
quote_style: None,
249-
keyword: Keyword::END
250-
}
251-
))),
227+
end_token: AttachedToken::empty(),
252228
})),
253229
behavior: None,
254230
called_on_null: None,
@@ -277,29 +253,17 @@ fn parse_create_function() {
277253
or_replace: false,
278254
temporary: false,
279255
if_not_exists: false,
280-
name: ObjectName::from(vec![Ident {
281-
value: "some_scalar_udf".into(),
282-
quote_style: None,
283-
span: Span::empty(),
284-
}]),
256+
name: ObjectName::from(vec![Ident::new("some_scalar_udf")]),
285257
args: Some(vec![
286258
OperateFunctionArg {
287259
mode: None,
288-
name: Some(Ident {
289-
value: "@foo".into(),
290-
quote_style: None,
291-
span: Span::empty(),
292-
}),
260+
name: Some(Ident::new("@foo")),
293261
data_type: DataType::Int(None),
294262
default_expr: None,
295263
},
296264
OperateFunctionArg {
297265
mode: None,
298-
name: Some(Ident {
299-
value: "@bar".into(),
300-
quote_style: None,
301-
span: Span::empty(),
302-
}),
266+
name: Some(Ident::new("@bar")),
303267
data_type: DataType::Varchar(Some(CharacterLength::IntegerLength {
304268
length: 256,
305269
unit: None
@@ -309,43 +273,25 @@ fn parse_create_function() {
309273
]),
310274
return_type: Some(DataType::Int(None)),
311275
function_body: Some(CreateFunctionBody::AsBeginEnd(BeginEndStatements {
312-
begin_token: AttachedToken(TokenWithSpan::wrap(sqlparser::tokenizer::Token::Word(
313-
sqlparser::tokenizer::Word {
314-
value: "BEGIN".to_string(),
315-
quote_style: None,
316-
keyword: Keyword::BEGIN
317-
}
318-
))),
276+
begin_token: AttachedToken::empty(),
319277
statements: vec![
320278
Statement::Set(Set::SingleAssignment {
321279
scope: None,
322280
hivevar: false,
323281
variable: ObjectName::from(vec!["@foo".into()]),
324282
values: vec![sqlparser::ast::Expr::BinaryOp {
325-
left: Box::new(sqlparser::ast::Expr::Identifier(Ident {
326-
value: "@foo".to_string(),
327-
quote_style: None,
328-
span: Span::empty(),
329-
})),
283+
left: Box::new(sqlparser::ast::Expr::Identifier(Ident::new("@foo"))),
330284
op: sqlparser::ast::BinaryOperator::Plus,
331285
right: Box::new(Expr::Value(number("1").with_empty_span())),
332286
}],
333287
}),
334288
Statement::Return(ReturnStatement {
335-
value: Some(ReturnStatementValue::Expr(Expr::Identifier(Ident {
336-
value: "@foo".into(),
337-
quote_style: None,
338-
span: Span::empty(),
339-
}))),
289+
value: Some(ReturnStatementValue::Expr(Expr::Identifier(Ident::new(
290+
"@foo"
291+
)))),
340292
}),
341293
],
342-
end_token: AttachedToken(TokenWithSpan::wrap(sqlparser::tokenizer::Token::Word(
343-
sqlparser::tokenizer::Word {
344-
value: "END".to_string(),
345-
quote_style: None,
346-
keyword: Keyword::END
347-
}
348-
))),
294+
end_token: AttachedToken::empty(),
349295
})),
350296
behavior: None,
351297
called_on_null: None,
@@ -379,21 +325,11 @@ fn parse_create_function() {
379325
or_replace: false,
380326
temporary: false,
381327
if_not_exists: false,
382-
name: ObjectName::from(vec![Ident {
383-
value: "some_scalar_udf".into(),
384-
quote_style: None,
385-
span: Span::empty(),
386-
}]),
328+
name: ObjectName::from(vec![Ident::new("some_scalar_udf")]),
387329
args: Some(vec![]),
388330
return_type: Some(DataType::Int(None)),
389331
function_body: Some(CreateFunctionBody::AsBeginEnd(BeginEndStatements {
390-
begin_token: AttachedToken(TokenWithSpan::wrap(sqlparser::tokenizer::Token::Word(
391-
sqlparser::tokenizer::Word {
392-
value: "BEGIN".to_string(),
393-
quote_style: None,
394-
keyword: Keyword::BEGIN
395-
}
396-
))),
332+
begin_token: AttachedToken::empty(),
397333
statements: vec![
398334
Statement::If(IfStatement {
399335
if_block: ConditionalStatementBlock {
@@ -448,13 +384,7 @@ fn parse_create_function() {
448384
))),
449385
}),
450386
],
451-
end_token: AttachedToken(TokenWithSpan::wrap(sqlparser::tokenizer::Token::Word(
452-
sqlparser::tokenizer::Word {
453-
value: "END".to_string(),
454-
quote_style: None,
455-
keyword: Keyword::END
456-
}
457-
))),
387+
end_token: AttachedToken::empty(),
458388
})),
459389
behavior: None,
460390
called_on_null: None,
@@ -486,29 +416,17 @@ fn parse_mssql_create_function() {
486416
or_replace: false,
487417
temporary: false,
488418
if_not_exists: false,
489-
name: ObjectName::from(vec![Ident {
490-
value: "some_scalar_udf".into(),
491-
quote_style: None,
492-
span: Span::empty(),
493-
}]),
419+
name: ObjectName::from(vec![Ident::new("some_scalar_udf")]),
494420
args: Some(vec![
495421
OperateFunctionArg {
496422
mode: None,
497-
name: Some(Ident {
498-
value: "@foo".into(),
499-
quote_style: None,
500-
span: Span::empty(),
501-
}),
423+
name: Some(Ident::new("@foo")),
502424
data_type: DataType::Int(None),
503425
default_expr: None,
504426
},
505427
OperateFunctionArg {
506428
mode: None,
507-
name: Some(Ident {
508-
value: "@bar".into(),
509-
quote_style: None,
510-
span: Span::empty(),
511-
}),
429+
name: Some(Ident::new("@bar")),
512430
data_type: DataType::Varchar(Some(CharacterLength::IntegerLength {
513431
length: 256,
514432
unit: None
@@ -518,43 +436,25 @@ fn parse_mssql_create_function() {
518436
]),
519437
return_type: Some(DataType::Int(None)),
520438
function_body: Some(CreateFunctionBody::AsBeginEnd(BeginEndStatements {
521-
begin_token: AttachedToken(TokenWithSpan::wrap(sqlparser::tokenizer::Token::Word(
522-
sqlparser::tokenizer::Word {
523-
value: "BEGIN".to_string(),
524-
quote_style: None,
525-
keyword: Keyword::BEGIN
526-
}
527-
))),
439+
begin_token: AttachedToken::empty(),
528440
statements: vec![
529441
Statement::Set(Set::SingleAssignment {
530442
scope: None,
531443
hivevar: false,
532444
variable: ObjectName::from(vec!["@foo".into()]),
533445
values: vec![sqlparser::ast::Expr::BinaryOp {
534-
left: Box::new(sqlparser::ast::Expr::Identifier(Ident {
535-
value: "@foo".to_string(),
536-
quote_style: None,
537-
span: Span::empty(),
538-
})),
446+
left: Box::new(sqlparser::ast::Expr::Identifier(Ident::new("@foo"))),
539447
op: sqlparser::ast::BinaryOperator::Plus,
540448
right: Box::new(Expr::Value(number("1").with_empty_span())),
541449
}],
542450
}),
543451
Statement::Return(ReturnStatement {
544-
value: Some(ReturnStatementValue::Expr(Expr::Identifier(Ident {
545-
value: "@foo".into(),
546-
quote_style: None,
547-
span: Span::empty(),
548-
}))),
452+
value: Some(ReturnStatementValue::Expr(Expr::Identifier(Ident::new(
453+
"@foo"
454+
)))),
549455
}),
550456
],
551-
end_token: AttachedToken(TokenWithSpan::wrap(sqlparser::tokenizer::Token::Word(
552-
sqlparser::tokenizer::Word {
553-
value: "END".to_string(),
554-
quote_style: None,
555-
keyword: Keyword::END
556-
}
557-
))),
457+
end_token: AttachedToken::empty(),
558458
})),
559459
behavior: None,
560460
called_on_null: None,

0 commit comments

Comments
 (0)