Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
Original file line number Diff line number Diff line change
Expand Up @@ -2013,6 +2013,10 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
if (!valid) { throw new ParseException(message); }
}

private static void requireDeleteSyntax(boolean valid, String message) throws ParseException {
if (!valid) { throw new ParseException(message); }
}

private static <E extends Enum<E>> E replicationEnum(Class<E> type, String value) throws ParseException {
try { return Enum.valueOf(type, MultiPartName.unquote(value).toUpperCase(Locale.ROOT)); }
catch (IllegalArgumentException exception) { throw new ParseException("Unknown " + type.getSimpleName() + ": " + value); }
Expand Down Expand Up @@ -7193,6 +7197,8 @@ Delete Delete():
if (joins != null && joins.size() > 0) {
delete.setJoins(joins);
}
requireDeleteSyntax(table != null || !tables.isEmpty(),
"DELETE requires a target table");
return delete.withWithItemsList(with)
.withTables(tables)
.withTable(table)
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/net/sf/jsqlparser/statement/delete/DeleteTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,20 @@ public void testDeleteDoesNotAllowLimitOffset() {
() -> parserManager.parse(new StringReader(statement)));
}

@Test
public void testDeleteRequiresTargetTable() {
// a missing target must not parse into a Delete whose toString()
// prints a literal "null" for the absent table
for (String statement : new String[] {
"DELETE",
"DELETE FROM",
"DELETE FROM WHERE a = 1",
"DELETE FROM USING t"}) {
assertThrows(JSQLParserException.class,
() -> parserManager.parse(new StringReader(statement)));
}
}

@Test
public void testDeleteWithOrderBy() throws JSQLParserException {
String stmt = "DELETE FROM tablename WHERE a = 1 AND b = 1 ORDER BY col";
Expand Down
Loading