@@ -455,7 +455,7 @@ fn parse_select_order_by() {
455
455
fn chk ( sql : & str ) {
456
456
let select = verified_query ( sql) ;
457
457
assert_eq ! (
458
- Some ( vec![
458
+ vec![
459
459
SQLOrderByExpr {
460
460
expr: ASTNode :: SQLIdentifier ( "lname" . to_string( ) ) ,
461
461
asc: Some ( true ) ,
@@ -468,7 +468,7 @@ fn parse_select_order_by() {
468
468
expr: ASTNode :: SQLIdentifier ( "id" . to_string( ) ) ,
469
469
asc: None ,
470
470
} ,
471
- ] ) ,
471
+ ] ,
472
472
select. order_by
473
473
) ;
474
474
}
@@ -484,7 +484,7 @@ fn parse_select_order_by_limit() {
484
484
ORDER BY lname ASC, fname DESC LIMIT 2";
485
485
let select = verified_query ( sql) ;
486
486
assert_eq ! (
487
- Some ( vec![
487
+ vec![
488
488
SQLOrderByExpr {
489
489
expr: ASTNode :: SQLIdentifier ( "lname" . to_string( ) ) ,
490
490
asc: Some ( true ) ,
@@ -493,7 +493,7 @@ fn parse_select_order_by_limit() {
493
493
expr: ASTNode :: SQLIdentifier ( "fname" . to_string( ) ) ,
494
494
asc: Some ( false ) ,
495
495
} ,
496
- ] ) ,
496
+ ] ,
497
497
select. order_by
498
498
) ;
499
499
assert_eq ! ( Some ( ASTNode :: SQLValue ( Value :: Long ( 2 ) ) ) , select. limit) ;
@@ -504,10 +504,10 @@ fn parse_select_group_by() {
504
504
let sql = "SELECT id, fname, lname FROM customer GROUP BY lname, fname" ;
505
505
let select = verified_only_select ( sql) ;
506
506
assert_eq ! (
507
- Some ( vec![
507
+ vec![
508
508
ASTNode :: SQLIdentifier ( "lname" . to_string( ) ) ,
509
509
ASTNode :: SQLIdentifier ( "fname" . to_string( ) ) ,
510
- ] ) ,
510
+ ] ,
511
511
select. group_by
512
512
) ;
513
513
}
@@ -746,7 +746,7 @@ fn parse_delimited_identifiers() {
746
746
} => {
747
747
assert_eq ! ( vec![ r#""a table""# . to_string( ) ] , name. 0 ) ;
748
748
assert_eq ! ( r#""alias""# , alias. unwrap( ) ) ;
749
- assert ! ( args. is_none ( ) ) ;
749
+ assert ! ( args. is_empty ( ) ) ;
750
750
assert ! ( with_hints. is_empty( ) ) ;
751
751
}
752
752
_ => panic ! ( "Expecting TableFactor::Table" ) ,
@@ -870,7 +870,7 @@ fn parse_implicit_join() {
870
870
relation: TableFactor :: Table {
871
871
name: SQLObjectName ( vec![ "t2" . to_string( ) ] ) ,
872
872
alias: None ,
873
- args: None ,
873
+ args: vec! [ ] ,
874
874
with_hints: vec![ ] ,
875
875
} ,
876
876
join_operator: JoinOperator :: Implicit
@@ -888,7 +888,7 @@ fn parse_cross_join() {
888
888
relation: TableFactor :: Table {
889
889
name: SQLObjectName ( vec![ "t2" . to_string( ) ] ) ,
890
890
alias: None ,
891
- args: None ,
891
+ args: vec! [ ] ,
892
892
with_hints: vec![ ] ,
893
893
} ,
894
894
join_operator: JoinOperator :: Cross
@@ -908,7 +908,7 @@ fn parse_joins_on() {
908
908
relation : TableFactor :: Table {
909
909
name : SQLObjectName ( vec ! [ relation. into( ) ] ) ,
910
910
alias,
911
- args : None ,
911
+ args : vec ! [ ] ,
912
912
with_hints : vec ! [ ] ,
913
913
} ,
914
914
join_operator : f ( JoinConstraint :: On ( ASTNode :: SQLBinaryExpr {
@@ -961,7 +961,7 @@ fn parse_joins_using() {
961
961
relation : TableFactor :: Table {
962
962
name : SQLObjectName ( vec ! [ relation. into( ) ] ) ,
963
963
alias,
964
- args : None ,
964
+ args : vec ! [ ] ,
965
965
with_hints : vec ! [ ] ,
966
966
} ,
967
967
join_operator : f ( JoinConstraint :: Using ( vec ! [ "c1" . into( ) ] ) ) ,
0 commit comments