mirrors/datafusion-sqlparse
1
0
Fork 0
mirror of https://github.com/apache/datafusion-sqlparser-rs.git synced 2025-08-30 10:47:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Replace Option<Vec<T>> with Vec<T>

Browse source 
Vectors can already represent the absence of any arguments (i.e., by
being empty), so there is no need to wrap them in an Option.
This commit is contained in:
Nikhil Benesch 2019-05-22 11:39:45 -04:00
parent 4f944dd4aa
commit 5652b4676c
No known key found for this signature in database
GPG key ID: F7386C5DEADABA7F
3 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

22
tests/sqlparser_common.rs
View file

@ -455,7 +455,7 @@ fn parse_select_order_by() {
fn chk(sql: &str) {
let select = verified_query(sql);
assert_eq!(
Some(vec![
vec![
SQLOrderByExpr {
expr: ASTNode::SQLIdentifier("lname".to_string()),
asc: Some(true),
@ -468,7 +468,7 @@ fn parse_select_order_by() {
expr: ASTNode::SQLIdentifier("id".to_string()),
asc: None,
},
]),
],
select.order_by
);
}
@ -484,7 +484,7 @@ fn parse_select_order_by_limit() {
ORDER BY lname ASC, fname DESC LIMIT 2";
let select = verified_query(sql);
assert_eq!(
Some(vec![
vec![
SQLOrderByExpr {
expr: ASTNode::SQLIdentifier("lname".to_string()),
asc: Some(true),
@ -493,7 +493,7 @@ fn parse_select_order_by_limit() {
expr: ASTNode::SQLIdentifier("fname".to_string()),
asc: Some(false),
},
]),
],
select.order_by
);
assert_eq!(Some(ASTNode::SQLValue(Value::Long(2))), select.limit);
@ -504,10 +504,10 @@ fn parse_select_group_by() {
let sql = "SELECT id, fname, lname FROM customer GROUP BY lname, fname";
let select = verified_only_select(sql);
assert_eq!(
Some(vec![
vec![
ASTNode::SQLIdentifier("lname".to_string()),
ASTNode::SQLIdentifier("fname".to_string()),
]),
],
select.group_by
);
}
@ -746,7 +746,7 @@ fn parse_delimited_identifiers() {
} => {
assert_eq!(vec![r#""a table""#.to_string()], name.0);
assert_eq!(r#""alias""#, alias.unwrap());
assert!(args.is_none());
assert!(args.is_empty());
assert!(with_hints.is_empty());
}
_ => panic!("Expecting TableFactor::Table"),
@ -870,7 +870,7 @@ fn parse_implicit_join() {
relation: TableFactor::Table {
name: SQLObjectName(vec!["t2".to_string()]),
alias: None,
args: None,
args: vec![],
with_hints: vec![],
},
join_operator: JoinOperator::Implicit
@ -888,7 +888,7 @@ fn parse_cross_join() {
relation: TableFactor::Table {
name: SQLObjectName(vec!["t2".to_string()]),
alias: None,
args: None,
args: vec![],
with_hints: vec![],
},
join_operator: JoinOperator::Cross
@ -908,7 +908,7 @@ fn parse_joins_on() {
relation: TableFactor::Table {
name: SQLObjectName(vec![relation.into()]),
alias,
args: None,
args: vec![],
with_hints: vec![],
},
join_operator: f(JoinConstraint::On(ASTNode::SQLBinaryExpr {
@ -961,7 +961,7 @@ fn parse_joins_using() {
relation: TableFactor::Table {
name: SQLObjectName(vec![relation.into()]),
alias,
args: None,
args: vec![],
with_hints: vec![],
},
join_operator: f(JoinConstraint::Using(vec!["c1".into()])),