Delete queries without from, with a schema identifier fails (#1224)

* Delete queries without from, with a schema identifier fails

* Better tests

* Fix style issue

* Deparse should match for DELETE WITHOUT FROM queries

Co-authored-by: François Sécherre <[email protected]>

Author: fanchuo

src/main/java/net/sf/jsqlparser/statement/delete/Delete.java

@@ -37,6 +37,7 @@ public class Delete implements Statement {
     private Expression where;
     private Limit limit;
     private List<OrderByElement> orderByElements;
+    private boolean hasFrom = true;
     public List<WithItem> getWithItemsList() {
         return withItemsList;
     }
@@ -123,6 +124,14 @@ public void setJoins(List<Join> joins) {
         this.joins = joins;
     }
 
+    public boolean isHasFrom() {
+        return this.hasFrom;
+    }
+
+    public void setHasFrom(boolean hasFrom) {
+        this.hasFrom = hasFrom;
+    }
+
     @Override
     @SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.NPathComplexity"})
     public String toString() {
@@ -148,8 +157,10 @@ public String toString() {
                     .collect(joining(", ")));
         }
 
-        b.append(" FROM ");
-        b.append(table);
+        if (hasFrom) {
+            b.append(" FROM");
+        }
+        b.append(" ").append(table);
 
         if (joins != null) {
             for (Join join : joins) {
@@ -205,6 +216,11 @@ public Delete withWhere(Expression where) {
         return this;
     }
 
+    public Delete withHasFrom(boolean hasFrom) {
+        this.setHasFrom(hasFrom);
+        return this;
+    }
+
     public Delete addTables(Table... tables) {
         List<Table> collection = Optional.ofNullable(getTables()).orElseGet(ArrayList::new);
         Collections.addAll(collection, tables);

src/main/java/net/sf/jsqlparser/util/deparser/DeleteDeParser.java

@@ -51,7 +51,10 @@ public void deParse(Delete delete) {
             buffer.append(
                     delete.getTables().stream().map(Table::getFullyQualifiedName).collect(joining(", ", " ", "")));
         }
-        buffer.append(" FROM ").append(delete.getTable().toString());
+        if (delete.isHasFrom()) {
+            buffer.append(" FROM");
+        }
+        buffer.append(" ").append(delete.getTable().toString());
 
         if (delete.getJoins() != null) {
             for (Join join : delete.getJoins()) {

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -1206,11 +1206,12 @@ Delete Delete( List<WithItem> with ):
     Expression where = null;
     Limit limit = null;
     List<OrderByElement> orderByElements;
+    boolean hasFrom = false;
 }
 {
-    <K_DELETE> { delete.setOracleHint(getOracleHint()); } [LOOKAHEAD(2) (table=TableWithAlias() { tables.add(table); }
+    <K_DELETE> { delete.setOracleHint(getOracleHint()); } [LOOKAHEAD(4) (table=TableWithAlias() { tables.add(table); }
           ("," table=TableWithAlias() { tables.add(table); } )*
-    <K_FROM> | <K_FROM>)]
+    <K_FROM> | <K_FROM>) { hasFrom = true; }]
 
     [ LOOKAHEAD(3) table=TableWithAlias()  joins=JoinsList() ]
     [where=WhereClause() { delete.setWhere(where); } ]
@@ -1221,7 +1222,7 @@ Delete Delete( List<WithItem> with ):
             delete.setJoins(joins);
         }
         return delete.withWithItemsList(with)
-              .withTables(tables).withTable(table);
+              .withTables(tables).withTable(table).withHasFrom(hasFrom);
     }
 }
 

src/test/java/net/sf/jsqlparser/statement/delete/DeleteTest.java

@@ -10,7 +10,7 @@
 package net.sf.jsqlparser.statement.delete;
 
 import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
-
+import static net.sf.jsqlparser.test.TestUtils.assertOracleHintExists;
 import static org.junit.Assert.assertEquals;
 
 import java.io.StringReader;
@@ -21,7 +21,7 @@
 import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
 import net.sf.jsqlparser.parser.CCJSqlParserManager;
 import net.sf.jsqlparser.schema.Column;
-import static net.sf.jsqlparser.test.TestUtils.assertOracleHintExists;
+
 import org.junit.Test;
 
 public class DeleteTest {
@@ -119,4 +119,16 @@ public void testWith() throws JSQLParserException {
 
     assertSqlCanBeParsedAndDeparsed(statement, true);
     }
+
+    @Test
+    public void testNoFrom() throws JSQLParserException {
+        String statement = "DELETE A WHERE Z = 1";
+        assertSqlCanBeParsedAndDeparsed(statement);
+    }
+
+    @Test
+    public void testNoFromWithSchema() throws JSQLParserException {
+        String statement = "DELETE A.B WHERE Z = 1";
+        assertSqlCanBeParsedAndDeparsed(statement);
+    }
 }