mirror of
https://github.com/apache/datafusion-sqlparser-rs.git
synced 2025-07-24 08:43:43 +00:00
Implement some MySQL specific syntax and extend the UPDATE statement (#375)
* * implement the ON DUPLICATE KEY syntax for MySQL in an INSERT statement * * add MySQL to the cli example * remove the dialect check for the ON DUPLICATE KEY insert to support custom dialects and unwrap some missing results * * use the Assignment DataType for the ON DUPLICATE KEY UPDATE * * add support for table aliases in an UPDATE statement * add support for JOINS in an UPDATE statement (for MySQL) * * implement the MySQL ALTER TABLE CHANGE COLUMN syntax * * fix the formatting of the else * rename the parse_identifiers_strict to parse_identifiers_non_keywords * Parse SUBSTRING calls that are separated with a comma instead of keywords * Fix the linting errors Co-authored-by: Piotr <piotr.morawski@nc-vision.com> Co-authored-by: Piotr Morawski <contact@peter-morawski.de>
This commit is contained in:
Andrew Lamb
GitHub
parent
40d67aab87
commit
82eaae1522
7 changed files with 489 additions and 18 deletions
|
|
@ -216,6 +216,321 @@ fn parse_create_table_with_minimum_display_width() {
|
|||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[cfg(not(feature = "bigdecimal"))]
|
||||
fn parse_simple_insert() {
|
||||
let sql = r"INSERT INTO tasks (title, priority) VALUES ('Test Some Inserts', 1), ('Test Entry 2', 2), ('Test Entry 3', 3)";
|
||||
|
||||
match mysql().verified_stmt(sql) {
|
||||
Statement::Insert {
|
||||
table_name,
|
||||
columns,
|
||||
source,
|
||||
on,
|
||||
..
|
||||
} => {
|
||||
assert_eq!(ObjectName(vec![Ident::new("tasks")]), table_name);
|
||||
assert_eq!(vec![Ident::new("title"), Ident::new("priority")], columns);
|
||||
assert!(on.is_none());
|
||||
assert_eq!(
|
||||
Box::new(Query {
|
||||
with: None,
|
||||
body: SetExpr::Values(Values(vec![
|
||||
vec![
|
||||
Expr::Value(Value::SingleQuotedString("Test Some Inserts".to_string())),
|
||||
Expr::Value(Value::Number("1".to_string(), false))
|
||||
],
|
||||
vec![
|
||||
Expr::Value(Value::SingleQuotedString("Test Entry 2".to_string())),
|
||||
Expr::Value(Value::Number("2".to_string(), false))
|
||||
],
|
||||
vec![
|
||||
Expr::Value(Value::SingleQuotedString("Test Entry 3".to_string())),
|
||||
Expr::Value(Value::Number("3".to_string(), false))
|
||||
]
|
||||
])),
|
||||
order_by: vec![],
|
||||
limit: None,
|
||||
offset: None,
|
||||
fetch: None,
|
||||
}),
|
||||
source
|
||||
);
|
||||
}
|
||||
_ => unreachable!(),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parse_insert_with_on_duplicate_update() {
|
||||
let sql = "INSERT INTO permission_groups (name, description, perm_create, perm_read, perm_update, perm_delete) VALUES ('accounting_manager', 'Some description about the group', true, true, true, true) ON DUPLICATE KEY UPDATE description = VALUES(description), perm_create = VALUES(perm_create), perm_read = VALUES(perm_read), perm_update = VALUES(perm_update), perm_delete = VALUES(perm_delete)";
|
||||
|
||||
match mysql().verified_stmt(sql) {
|
||||
Statement::Insert {
|
||||
table_name,
|
||||
columns,
|
||||
source,
|
||||
on,
|
||||
..
|
||||
} => {
|
||||
assert_eq!(
|
||||
ObjectName(vec![Ident::new("permission_groups")]),
|
||||
table_name
|
||||
);
|
||||
assert_eq!(
|
||||
vec![
|
||||
Ident::new("name"),
|
||||
Ident::new("description"),
|
||||
Ident::new("perm_create"),
|
||||
Ident::new("perm_read"),
|
||||
Ident::new("perm_update"),
|
||||
Ident::new("perm_delete")
|
||||
],
|
||||
columns
|
||||
);
|
||||
assert_eq!(
|
||||
Box::new(Query {
|
||||
with: None,
|
||||
body: SetExpr::Values(Values(vec![vec![
|
||||
Expr::Value(Value::SingleQuotedString("accounting_manager".to_string())),
|
||||
Expr::Value(Value::SingleQuotedString(
|
||||
"Some description about the group".to_string()
|
||||
)),
|
||||
Expr::Value(Value::Boolean(true)),
|
||||
Expr::Value(Value::Boolean(true)),
|
||||
Expr::Value(Value::Boolean(true)),
|
||||
Expr::Value(Value::Boolean(true)),
|
||||
]])),
|
||||
order_by: vec![],
|
||||
limit: None,
|
||||
offset: None,
|
||||
fetch: None,
|
||||
}),
|
||||
source
|
||||
);
|
||||
assert_eq!(
|
||||
Some(OnInsert::DuplicateKeyUpdate(vec![
|
||||
Assignment {
|
||||
id: vec![Ident::new("description".to_string())],
|
||||
value: Expr::Function(Function {
|
||||
name: ObjectName(vec![Ident::new("VALUES".to_string()),]),
|
||||
args: vec![FunctionArg::Unnamed(Expr::Identifier(Ident::new(
|
||||
"description"
|
||||
)))],
|
||||
over: None,
|
||||
distinct: false
|
||||
})
|
||||
},
|
||||
Assignment {
|
||||
id: vec![Ident::new("perm_create".to_string())],
|
||||
value: Expr::Function(Function {
|
||||
name: ObjectName(vec![Ident::new("VALUES".to_string()),]),
|
||||
args: vec![FunctionArg::Unnamed(Expr::Identifier(Ident::new(
|
||||
"perm_create"
|
||||
)))],
|
||||
over: None,
|
||||
distinct: false
|
||||
})
|
||||
},
|
||||
Assignment {
|
||||
id: vec![Ident::new("perm_read".to_string())],
|
||||
value: Expr::Function(Function {
|
||||
name: ObjectName(vec![Ident::new("VALUES".to_string()),]),
|
||||
args: vec![FunctionArg::Unnamed(Expr::Identifier(Ident::new(
|
||||
"perm_read"
|
||||
)))],
|
||||
over: None,
|
||||
distinct: false
|
||||
})
|
||||
},
|
||||
Assignment {
|
||||
id: vec![Ident::new("perm_update".to_string())],
|
||||
value: Expr::Function(Function {
|
||||
name: ObjectName(vec![Ident::new("VALUES".to_string()),]),
|
||||
args: vec![FunctionArg::Unnamed(Expr::Identifier(Ident::new(
|
||||
"perm_update"
|
||||
)))],
|
||||
over: None,
|
||||
distinct: false
|
||||
})
|
||||
},
|
||||
Assignment {
|
||||
id: vec![Ident::new("perm_delete".to_string())],
|
||||
value: Expr::Function(Function {
|
||||
name: ObjectName(vec![Ident::new("VALUES".to_string()),]),
|
||||
args: vec![FunctionArg::Unnamed(Expr::Identifier(Ident::new(
|
||||
"perm_delete"
|
||||
)))],
|
||||
over: None,
|
||||
distinct: false
|
||||
})
|
||||
},
|
||||
])),
|
||||
on
|
||||
);
|
||||
}
|
||||
_ => unreachable!(),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parse_update_with_joins() {
|
||||
let sql = "UPDATE orders AS o JOIN customers AS c ON o.customer_id = c.id SET o.completed = true WHERE c.firstname = 'Peter'";
|
||||
match mysql().verified_stmt(sql) {
|
||||
Statement::Update {
|
||||
table,
|
||||
assignments,
|
||||
selection,
|
||||
} => {
|
||||
assert_eq!(
|
||||
TableWithJoins {
|
||||
relation: TableFactor::Table {
|
||||
name: ObjectName(vec![Ident::new("orders")]),
|
||||
alias: Some(TableAlias {
|
||||
name: Ident::new("o"),
|
||||
columns: vec![]
|
||||
}),
|
||||
args: vec![],
|
||||
with_hints: vec![],
|
||||
},
|
||||
joins: vec![Join {
|
||||
relation: TableFactor::Table {
|
||||
name: ObjectName(vec![Ident::new("customers")]),
|
||||
alias: Some(TableAlias {
|
||||
name: Ident::new("c"),
|
||||
columns: vec![]
|
||||
}),
|
||||
args: vec![],
|
||||
with_hints: vec![],
|
||||
},
|
||||
join_operator: JoinOperator::Inner(JoinConstraint::On(Expr::BinaryOp {
|
||||
left: Box::new(Expr::CompoundIdentifier(vec![
|
||||
Ident::new("o"),
|
||||
Ident::new("customer_id")
|
||||
])),
|
||||
op: BinaryOperator::Eq,
|
||||
right: Box::new(Expr::CompoundIdentifier(vec![
|
||||
Ident::new("c"),
|
||||
Ident::new("id")
|
||||
]))
|
||||
})),
|
||||
}]
|
||||
},
|
||||
table
|
||||
);
|
||||
assert_eq!(
|
||||
vec![Assignment {
|
||||
id: vec![Ident::new("o"), Ident::new("completed")],
|
||||
value: Expr::Value(Value::Boolean(true))
|
||||
}],
|
||||
assignments
|
||||
);
|
||||
assert_eq!(
|
||||
Some(Expr::BinaryOp {
|
||||
left: Box::new(Expr::CompoundIdentifier(vec![
|
||||
Ident::new("c"),
|
||||
Ident::new("firstname")
|
||||
])),
|
||||
op: BinaryOperator::Eq,
|
||||
right: Box::new(Expr::Value(Value::SingleQuotedString("Peter".to_string())))
|
||||
}),
|
||||
selection
|
||||
);
|
||||
}
|
||||
_ => unreachable!(),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parse_alter_table_change_column() {
|
||||
let expected_name = ObjectName(vec![Ident::new("orders")]);
|
||||
let expected_operation = AlterTableOperation::ChangeColumn {
|
||||
old_name: Ident::new("description"),
|
||||
new_name: Ident::new("desc"),
|
||||
data_type: DataType::Text,
|
||||
options: vec![ColumnOption::NotNull],
|
||||
};
|
||||
|
||||
let sql1 = "ALTER TABLE orders CHANGE COLUMN description desc TEXT NOT NULL";
|
||||
match mysql().verified_stmt(sql1) {
|
||||
Statement::AlterTable { name, operation } => {
|
||||
assert_eq!(expected_name, name);
|
||||
assert_eq!(expected_operation, operation);
|
||||
}
|
||||
_ => unreachable!(),
|
||||
}
|
||||
|
||||
let sql2 = "ALTER TABLE orders CHANGE description desc TEXT NOT NULL";
|
||||
match mysql().one_statement_parses_to(sql2, sql1) {
|
||||
Statement::AlterTable { name, operation } => {
|
||||
assert_eq!(expected_name, name);
|
||||
assert_eq!(expected_operation, operation);
|
||||
}
|
||||
_ => unreachable!(),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[cfg(not(feature = "bigdecimal"))]
|
||||
fn parse_substring_in_select() {
|
||||
let sql = "SELECT DISTINCT SUBSTRING(description, 0, 1) FROM test";
|
||||
match mysql().one_statement_parses_to(
|
||||
sql,
|
||||
"SELECT DISTINCT SUBSTRING(description FROM 0 FOR 1) FROM test",
|
||||
) {
|
||||
Statement::Query(query) => {
|
||||
assert_eq!(
|
||||
Box::new(Query {
|
||||
with: None,
|
||||
body: SetExpr::Select(Box::new(Select {
|
||||
distinct: true,
|
||||
top: None,
|
||||
projection: vec![SelectItem::UnnamedExpr(Expr::Substring {
|
||||
expr: Box::new(Expr::Identifier(Ident {
|
||||
value: "description".to_string(),
|
||||
quote_style: None
|
||||
})),
|
||||
substring_from: Some(Box::new(Expr::Value(Value::Number(
|
||||
"0".to_string(),
|
||||
false
|
||||
)))),
|
||||
substring_for: Some(Box::new(Expr::Value(Value::Number(
|
||||
"1".to_string(),
|
||||
false
|
||||
))))
|
||||
})],
|
||||
from: vec![TableWithJoins {
|
||||
relation: TableFactor::Table {
|
||||
name: ObjectName(vec![Ident {
|
||||
value: "test".to_string(),
|
||||
quote_style: None
|
||||
}]),
|
||||
alias: None,
|
||||
args: vec![],
|
||||
with_hints: vec![]
|
||||
},
|
||||
joins: vec![]
|
||||
}],
|
||||
lateral_views: vec![],
|
||||
selection: None,
|
||||
group_by: vec![],
|
||||
cluster_by: vec![],
|
||||
distribute_by: vec![],
|
||||
sort_by: vec![],
|
||||
having: None,
|
||||
})),
|
||||
order_by: vec![],
|
||||
limit: None,
|
||||
offset: None,
|
||||
fetch: None
|
||||
}),
|
||||
query
|
||||
);
|
||||
}
|
||||
_ => unreachable!(),
|
||||
}
|
||||
}
|
||||
|
||||
fn mysql() -> TestedDialects {
|
||||
TestedDialects {
|
||||
dialects: vec![Box::new(MySqlDialect {})],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue