Merge pull request #517 from natzcam/master

Fix for some cases where TableNamesFinder can't find tables

Author: wumpz

src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java

@@ -204,6 +204,11 @@ public void visit(PlainSelect plainSelect) {
         if (plainSelect.getWhere() != null) {
             plainSelect.getWhere().accept(this);
         }
+          
+        if(plainSelect.getHaving() != null){
+            plainSelect.getHaving().accept(this);
+        }
+        
         if (plainSelect.getOracleHierarchical() != null) {
             plainSelect.getOracleHierarchical().accept(this);
         }
@@ -593,6 +598,13 @@ public void visit(MySQLGroupConcat groupConcat) {
     @Override
     public void visit(Delete delete) {
         tables.add(delete.getTable().getName());
+
+        if (delete.getJoins() != null) {
+            for (Join join : delete.getJoins()) {
+                join.getRightItem().accept(this);
+            }
+        }
+
         if (delete.getWhere() != null) {
             delete.getWhere().accept(this);
         }

src/test/java/net/sf/jsqlparser/util/TablesNamesFinderTest.java

@@ -192,6 +192,19 @@ public void testGetTableListFromDelete2() throws Exception {
         assertEquals(1, tableList.size());
         assertTrue(tableList.contains("MY_TABLE1"));
     }
+    
+    @Test
+    public void testGetTableListFromDeleteWithJoin() throws Exception {
+        String sql = "DELETE t1, t2 FROM MY_TABLE1 t1 JOIN MY_TABLE2 t2 ON t1.id = t2.id";
+        net.sf.jsqlparser.statement.Statement statement = pm.parse(new StringReader(sql));
+
+        Delete deleteStatement = (Delete) statement;
+        TablesNamesFinder tablesNamesFinder = new TablesNamesFinder();
+        List<String> tableList = tablesNamesFinder.getTableList(deleteStatement);
+        assertEquals(2, tableList.size());
+        assertTrue(tableList.contains("MY_TABLE1"));
+        assertTrue(tableList.contains("MY_TABLE2"));
+    }
 
     @Test
     public void testGetTableListFromInsert() throws Exception {
@@ -470,4 +483,16 @@ public void testExpressionIssue515() throws JSQLParserException {
         assertEquals(1, tableList.size());
         assertTrue(tableList.contains("SOME_TABLE"));
     }
+    
+    public void testSelectHavingSubquery() throws Exception {
+        String sql = "SELECT * FROM TABLE1 GROUP BY COL1 HAVING SUM(COL2) > (SELECT COUNT(*) FROM TABLE2)";
+        net.sf.jsqlparser.statement.Statement statement = pm.parse(new StringReader(sql));
+
+        Select selectStmt = (Select) statement;
+        TablesNamesFinder tablesNamesFinder = new TablesNamesFinder();
+        List<String> tableList = tablesNamesFinder.getTableList(selectStmt);
+        assertEquals(2, tableList.size());
+        assertTrue(tableList.contains("TABLE1"));
+        assertTrue(tableList.contains("TABLE2"));
+    }
 }