Merge origin/master

Author: wumpz

src/main/java/net/sf/jsqlparser/expression/CaseExpression.java

@@ -59,7 +59,7 @@
 public class CaseExpression implements Expression {
 
     private Expression switchExpression;
-    private List<Expression> whenClauses;
+    private List<WhenClause> whenClauses;
     private Expression elseExpression;
 
     @Override
@@ -98,14 +98,14 @@ public void setElseExpression(Expression elseExpression) {
     /**
      * @return Returns the whenClauses.
      */
-    public List<Expression> getWhenClauses() {
+    public List<WhenClause> getWhenClauses() {
         return whenClauses;
     }
 
     /**
      * @param whenClauses The whenClauses to set.
      */
-    public void setWhenClauses(List<Expression> whenClauses) {
+    public void setWhenClauses(List<WhenClause> whenClauses) {
         this.whenClauses = whenClauses;
     }
 

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

@@ -137,8 +137,8 @@ public class TablesNamesFinder implements SelectVisitor, FromItemVisitor, Expres
     private static final String NOT_SUPPORTED_YET = "Not supported yet.";
     private List<String> tables;
     /**
-     * There are special names, that are not table names but are parsed as tables. These names are
-     * collected here and are not included in the tables - names anymore.
+     * There are special names, that are not table names but are parsed as tables. These names are collected here and
+     * are not included in the tables - names anymore.
      */
     private List<String> otherItemNames;
 
@@ -395,6 +395,17 @@ public void visit(TimeValue timeValue) {
      */
     @Override
     public void visit(CaseExpression caseExpression) {
+        if (caseExpression.getSwitchExpression() != null) {
+            caseExpression.getSwitchExpression().accept(this);
+        }
+        if (caseExpression.getWhenClauses() != null) {
+            for (WhenClause when : caseExpression.getWhenClauses()) {
+                when.accept(this);
+            }
+        }
+        if (caseExpression.getElseExpression()!=null) {
+            caseExpression.getElseExpression().accept(this);
+        }
     }
 
     /*
@@ -404,6 +415,12 @@ public void visit(CaseExpression caseExpression) {
      */
     @Override
     public void visit(WhenClause whenClause) {
+        if (whenClause.getWhenExpression() != null) {
+            whenClause.getWhenExpression().accept(this);
+        }
+        if (whenClause.getThenExpression() != null) {
+            whenClause.getThenExpression().accept(this);
+        }
     }
 
     @Override
@@ -716,10 +733,10 @@ public void visit(TimeKeyExpression timeKeyExpression) {
     public void visit(DateTimeLiteralExpression literal) {
 
     }
-    
+
     @Override
     public void visit(Commit commit) {
-        
+
     }
 
     @Override

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

@@ -2631,7 +2631,7 @@ Expression CaseWhenExpression() #CaseWhenExpression:
     CaseExpression caseExp = new CaseExpression();
     Expression switchExp = null;
     WhenClause clause;
-    List whenClauses = new ArrayList();
+    List<WhenClause> whenClauses = new ArrayList<WhenClause>();
     Expression elseExp = null;
 }
 {
@@ -3471,4 +3471,4 @@ Commit Commit():
   {
     return commit;
   }
-}
+}

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

@@ -415,7 +415,7 @@ public void testGetTableListForMergeUsingQuery() throws Exception {
         assertEquals("employees", (String) tableList.get(0));
         assertEquals("hr_records", (String) tableList.get(1));
     }
-    
+
     @Test
     public void testUpsertValues() throws Exception {
         String sql = "UPSERT INTO MY_TABLE1 (a) VALUES (5)";
@@ -427,7 +427,7 @@ public void testUpsertValues() throws Exception {
         assertEquals(1, tableList.size());
         assertTrue(tableList.contains("MY_TABLE1"));
     }
-    
+
     @Test
     public void testUpsertSelect() throws Exception {
         String sql = "UPSERT INTO mytable (mycolumn) SELECT mycolumn FROM mytable2";
@@ -440,5 +440,34 @@ public void testUpsertSelect() throws Exception {
         assertTrue(tableList.contains("mytable"));
         assertTrue(tableList.contains("mytable2"));
     }
-    
+
+    @Test
+    public void testCaseWhenSubSelect() throws JSQLParserException {
+        String sql = "select case (select count(*) from mytable2) when 1 then 0 else -1 end";
+        Statement stmt = CCJSqlParserUtil.parse(sql);
+        TablesNamesFinder tablesNamesFinder = new TablesNamesFinder();
+        List<String> tableList = tablesNamesFinder.getTableList(stmt);
+        assertEquals(1, tableList.size());
+        assertTrue(tableList.contains("mytable2"));
+    }
+
+    @Test
+    public void testCaseWhenSubSelect2() throws JSQLParserException {
+        String sql = "select case when (select count(*) from mytable2) = 1 then 0 else -1 end";
+        Statement stmt = CCJSqlParserUtil.parse(sql);
+        TablesNamesFinder tablesNamesFinder = new TablesNamesFinder();
+        List<String> tableList = tablesNamesFinder.getTableList(stmt);
+        assertEquals(1, tableList.size());
+        assertTrue(tableList.contains("mytable2"));
+    }
+
+    @Test
+    public void testCaseWhenSubSelect3() throws JSQLParserException {
+        String sql = "select case when 1 = 2 then 0 else (select count(*) from mytable2) end";
+        Statement stmt = CCJSqlParserUtil.parse(sql);
+        TablesNamesFinder tablesNamesFinder = new TablesNamesFinder();
+        List<String> tableList = tablesNamesFinder.getTableList(stmt);
+        assertEquals(1, tableList.size());
+        assertTrue(tableList.contains("mytable2"));
+    }
 }