Fix JSQLParser table name extraction

Author: beikov

testsuite-base/assertion/src/main/java/com/blazebit/persistence/testsuite/base/jpa/assertion/AbstractAssertStatement.java

@@ -162,21 +162,24 @@ private List<Table> getTables(Statement statement) {
                 final List<Table> tables = new ArrayList<>();
                 FromItemVisitor visitor = new FromItemVisitorAdapter() {
                     @Override
-                    public void visit(Table table) {
+                    public Object visit(Table table, Object context) {
                         tables.add(table);
+                        return null;
                     }
 
                     @Override
-                    public void visit(ParenthesedSelect selectBody) {
-                        tables.addAll( getTables( selectBody.getSelect() ) );
+                    public Object visit(ParenthesedSelect selectBody, Object context) {
+                        tables.addAll(getTables(selectBody.getSelect()));
+                        return null;
                     }
 
                     @Override
-                    public void visit(ParenthesedFromItem fromItem) {
-                        fromItem.getFromItem().accept( this );
+                    public Object visit(ParenthesedFromItem fromItem, Object context) {
+                        fromItem.getFromItem().accept(this);
                         for (Join join : fromItem.getJoins()) {
                             join.getRightItem().accept(this);
                         }
+                        return null;
                     }
                 };
                 plainSelect.getFromItem().accept(visitor);
@@ -204,14 +207,16 @@ public void visit(ParenthesedFromItem fromItem) {
             Delete delete = (Delete) statement;
             if (delete.getTables().size() == 1) {
                 Table t = delete.getTables().get(0);
-                if (delete.getJoins() != null && !delete.getJoins().isEmpty()) {
-                    for (Join join : delete.getJoins()) {
-                        if (join.getRightItem().getAlias().getName().equals(t.getName())) {
-                            return Collections.singletonList((Table) join.getRightItem());
+                if (!t.getName().equals(delete.getTable().getAlias().getName())) {
+                    if (delete.getJoins() != null && !delete.getJoins().isEmpty()) {
+                        for (Join join : delete.getJoins()) {
+                            if (join.getRightItem().getAlias().getName().equals(t.getName())) {
+                                return Collections.singletonList((Table) join.getRightItem());
+                            }
                         }
                     }
+                    return Collections.singletonList(t);
                 }
-                return Collections.singletonList(t);
             }
             return Collections.singletonList(delete.getTable());
         } else if (statement instanceof Merge) {