Skip to content

Support multiple-table DELETE syntax #855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 27, 2023
Merged

Support multiple-table DELETE syntax #855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions src/ast/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,10 +1207,12 @@ pub enum Statement {
},
/// DELETE
Delete {
/// Multi tables delete are supported in mysql
tables: Vec<ObjectName>,
/// FROM
table_name: TableFactor,
/// USING (Snowflake, Postgres)
using: Option<TableFactor>,
from: Vec<TableWithJoins>,
/// USING (Snowflake, Postgres, MySQL)
using: Option<Vec<TableWithJoins>>,
/// WHERE
selection: Option<Expr>,
/// RETURNING
Expand Down Expand Up @@ -1960,14 +1962,19 @@ impl fmt::Display for Statement {
Ok(())
}
Statement::Delete {
table_name,
tables,
from,
using,
selection,
returning,
} => {
write!(f, "DELETE FROM {table_name}")?;
write!(f, "DELETE ")?;
if !tables.is_empty() {
write!(f, "{} ", display_comma_separated(tables))?;
}
write!(f, "FROM {}", display_comma_separated(from))?;
if let Some(using) = using {
write!(f, " USING {using}")?;
write!(f, " USING {}", display_comma_separated(using))?;
}
if let Some(selection) = selection {
write!(f, " WHERE {selection}")?;
Expand Down
16 changes: 12 additions & 4 deletions src/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4813,10 +4813,17 @@ impl<'a> Parser<'a> {
}

pub fn parse_delete(&mut self) -> Result<Statement, ParserError> {
self.expect_keyword(Keyword::FROM)?;
let table_name = self.parse_table_factor()?;
let tables = if !self.parse_keyword(Keyword::FROM) {
let tables = self.parse_comma_separated(Parser::parse_object_name)?;
self.expect_keyword(Keyword::FROM)?;
tables
} else {
vec![]
};

let from = self.parse_comma_separated(Parser::parse_table_and_joins)?;
let using = if self.parse_keyword(Keyword::USING) {
Some(self.parse_table_factor()?)
Some(self.parse_comma_separated(Parser::parse_table_and_joins)?)
} else {
None
};
Expand All @@ -4833,7 +4840,8 @@ impl<'a> Parser<'a> {
};

Ok(Statement::Delete {
table_name,
tables,
from,
using,
selection,
returning,
Expand Down
122 changes: 106 additions & 16 deletions tests/sqlparser_common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,15 +385,101 @@ fn parse_no_table_name() {
fn parse_delete_statement() {
let sql = "DELETE FROM \"table\"";
match verified_stmt(sql) {
Statement::Delete { table_name, .. } => {
Statement::Delete { from, .. } => {
assert_eq!(
TableFactor::Table {
name: ObjectName(vec![Ident::with_quote('"', "table")]),
alias: None,
args: None,
with_hints: vec![],
},
table_name
from[0].relation
);
}
_ => unreachable!(),
}
}

#[test]
fn parse_delete_statement_for_multi_tables() {
let sql = "DELETE schema1.table1, schema2.table2 FROM schema1.table1 JOIN schema2.table2 ON schema2.table2.col1 = schema1.table1.col1 WHERE schema2.table2.col2 = 1";
match verified_stmt(sql) {
Statement::Delete { tables, from, .. } => {
assert_eq!(
ObjectName(vec![Ident::new("schema1"), Ident::new("table1")]),
tables[0]
);
assert_eq!(
ObjectName(vec![Ident::new("schema2"), Ident::new("table2")]),
tables[1]
);
assert_eq!(
TableFactor::Table {
name: ObjectName(vec![Ident::new("schema1"), Ident::new("table1")]),
alias: None,
args: None,
with_hints: vec![],
},
from[0].relation
);
assert_eq!(
TableFactor::Table {
name: ObjectName(vec![Ident::new("schema2"), Ident::new("table2")]),
alias: None,
args: None,
with_hints: vec![],
},
from[0].joins[0].relation
);
}
_ => unreachable!(),
}
}

#[test]
fn parse_delete_statement_for_multi_tables_with_using() {
let sql = "DELETE FROM schema1.table1, schema2.table2 USING schema1.table1 JOIN schema2.table2 ON schema2.table2.pk = schema1.table1.col1 WHERE schema2.table2.col2 = 1";
match verified_stmt(sql) {
Statement::Delete {
from,
using: Some(using),
..
} => {
assert_eq!(
TableFactor::Table {
name: ObjectName(vec![Ident::new("schema1"), Ident::new("table1")]),
alias: None,
args: None,
with_hints: vec![],
},
from[0].relation
);
assert_eq!(
TableFactor::Table {
name: ObjectName(vec![Ident::new("schema2"), Ident::new("table2")]),
alias: None,
args: None,
with_hints: vec![],
},
from[1].relation
);
assert_eq!(
TableFactor::Table {
name: ObjectName(vec![Ident::new("schema1"), Ident::new("table1")]),
alias: None,
args: None,
with_hints: vec![],
},
using[0].relation
);
assert_eq!(
TableFactor::Table {
name: ObjectName(vec![Ident::new("schema2"), Ident::new("table2")]),
alias: None,
args: None,
with_hints: vec![],
},
using[0].joins[0].relation
);
}
_ => unreachable!(),
Expand All @@ -407,7 +493,8 @@ fn parse_where_delete_statement() {
let sql = "DELETE FROM foo WHERE name = 5";
match verified_stmt(sql) {
Statement::Delete {
table_name,
tables: _,
from,
using,
selection,
returning,
Expand All @@ -419,7 +506,7 @@ fn parse_where_delete_statement() {
args: None,
with_hints: vec![],
},
table_name,
from[0].relation,
);

assert_eq!(None, using);
Expand All @@ -444,7 +531,8 @@ fn parse_where_delete_with_alias_statement() {
let sql = "DELETE FROM basket AS a USING basket AS b WHERE a.id < b.id";
match verified_stmt(sql) {
Statement::Delete {
table_name,
tables: _,
from,
using,
selection,
returning,
Expand All @@ -459,19 +547,21 @@ fn parse_where_delete_with_alias_statement() {
args: None,
with_hints: vec![],
},
table_name,
from[0].relation,
);

assert_eq!(
Some(TableFactor::Table {
name: ObjectName(vec![Ident::new("basket")]),
alias: Some(TableAlias {
name: Ident::new("b"),
columns: vec![],
}),
args: None,
with_hints: vec![],
}),
Some(vec![TableWithJoins {
relation: TableFactor::Table {
name: ObjectName(vec![Ident::new("basket")]),
alias: Some(TableAlias {
name: Ident::new("b"),
columns: vec![],
}),
args: None,
with_hints: vec![],
},
joins: vec![],
}]),
using
);
assert_eq!(
Expand Down