Support DELETE with ORDER BY and LIMIT (MySQL) (#992)

src/ast/mod.rs

@@ -1301,6 +1301,10 @@ pub enum Statement {
         selection: Option<Expr>,
         /// RETURNING
         returning: Option<Vec<SelectItem>>,
+        /// ORDER BY (MySQL)
+        order_by: Vec<OrderByExpr>,
+        /// LIMIT (MySQL)
+        limit: Option<Expr>,
     },
     /// CREATE VIEW
     CreateView {
@@ -2141,6 +2145,8 @@ impl fmt::Display for Statement {
                 using,
                 selection,
                 returning,
+                order_by,
+                limit,
             } => {
                 write!(f, "DELETE ")?;
                 if !tables.is_empty() {
@@ -2156,6 +2162,12 @@ impl fmt::Display for Statement {
                 if let Some(returning) = returning {
                     write!(f, " RETURNING {}", display_comma_separated(returning))?;
                 }
+                if !order_by.is_empty() {
+                    write!(f, " ORDER BY {}", display_comma_separated(order_by))?;
+                }
+                if let Some(limit) = limit {
+                    write!(f, " LIMIT {limit}")?;
+                }
                 Ok(())
             }
             Statement::Close { cursor } => {

src/parser/mod.rs

@@ -5306,12 +5306,21 @@ impl<'a> Parser<'a> {
         } else {
             None
         };
-
         let returning = if self.parse_keyword(Keyword::RETURNING) {
             Some(self.parse_comma_separated(Parser::parse_select_item)?)
         } else {
             None
         };
+        let order_by = if self.parse_keywords(&[Keyword::ORDER, Keyword::BY]) {
+            self.parse_comma_separated(Parser::parse_order_by_expr)?
+        } else {
+            vec![]
+        };
+        let limit = if self.parse_keyword(Keyword::LIMIT) {
+            self.parse_limit()?
+        } else {
+            None
+        };
 
         Ok(Statement::Delete {
             tables,
@@ -5319,6 +5328,8 @@ impl<'a> Parser<'a> {
             using,
             selection,
             returning,
+            order_by,
+            limit,
         })
     }
 

tests/sqlparser_common.rs

@@ -525,6 +525,7 @@ fn parse_where_delete_statement() {
             using,
             selection,
             returning,
+            ..
         } => {
             assert_eq!(
                 TableFactor::Table {
@@ -565,6 +566,7 @@ fn parse_where_delete_with_alias_statement() {
             using,
             selection,
             returning,
+            ..
         } => {
             assert_eq!(
                 TableFactor::Table {

tests/sqlparser_mysql.rs

@@ -1315,6 +1315,38 @@ fn parse_update_with_joins() {
     }
 }
 
+#[test]
+fn parse_delete_with_order_by() {
+    let sql = "DELETE FROM customers ORDER BY id DESC";
+    match mysql().verified_stmt(sql) {
+        Statement::Delete { order_by, .. } => {
+            assert_eq!(
+                vec![OrderByExpr {
+                    expr: Expr::Identifier(Ident {
+                        value: "id".to_owned(),
+                        quote_style: None
+                    }),
+                    asc: Some(false),
+                    nulls_first: None,
+                }],
+                order_by
+            );
+        }
+        _ => unreachable!(),
+    }
+}
+
+#[test]
+fn parse_delete_with_limit() {
+    let sql = "DELETE FROM customers LIMIT 100";
+    match mysql().verified_stmt(sql) {
+        Statement::Delete { limit, .. } => {
+            assert_eq!(Some(Expr::Value(number("100"))), limit);
+        }
+        _ => unreachable!(),
+    }
+}
+
 #[test]
 fn parse_alter_table_drop_primary_key() {
     assert_matches!(