case else corrected to allow conditions here as well

Author: wumpz

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

@@ -2155,12 +2155,10 @@ Expression Condition():
 }
 {
     [ <K_NOT> { not = true; }]
-    (LOOKAHEAD(SQLCondition()) result=SQLCondition()
-    | LOOKAHEAD(RegularCondition()) result=RegularCondition()
-    | LOOKAHEAD(Function()) result=Function()
-    /* | <K_NOT> result=Column() { result = new NotExpression(result); } */
-    | result=Column()
-    | LOOKAHEAD({ "0".equals(getToken(1).image) || "1".equals(getToken(1).image) }) token=<S_LONG> { result = new LongValue(token.image); }
+    (
+        LOOKAHEAD(SQLCondition()) result=SQLCondition()
+        | LOOKAHEAD(RegularCondition()) result=RegularCondition()
+        | result=SimpleExpression()
     )
 
     { return not?new NotExpression(result):result; }
@@ -2968,7 +2966,7 @@ Expression CaseWhenExpression() #CaseWhenExpression:
             (LOOKAHEAD(RegularCondition()) switchExp=RegularCondition() | switchExp=BitwiseAndOr())
              ( clause=WhenThenValue() { whenClauses.add(clause); } )+
     )
-   [<K_ELSE> elseExp=SimpleExpression()]
+   [<K_ELSE> elseExp=Condition()]
     <K_END>
     {
         caseExp.setSwitchExpression(switchExp);
@@ -2985,7 +2983,8 @@ WhenClause WhenThenSearchCondition():
     Expression thenExp = null;
 }
 {
-    <K_WHEN> (LOOKAHEAD(Expression()) whenExp=Expression() | whenExp=SimpleExpression()) <K_THEN> thenExp=SimpleExpression()
+    <K_WHEN> (LOOKAHEAD(Expression()) whenExp=Expression() | whenExp=SimpleExpression()) 
+        <K_THEN> thenExp=Condition()
     {
        whenThen.setWhenExpression(whenExp);
        whenThen.setThenExpression(thenExp);

src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java

@@ -2805,16 +2805,15 @@ public void testCastToSignedInteger() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT CAST(contact_id AS SIGNED INTEGER) FROM contact WHERE contact_id = 20");
     }
 
-    @Test
-    public void testWhereIssue240_notBoolean() {
-        try {
-            CCJSqlParserUtil.parse("SELECT count(*) FROM mytable WHERE 5");
-            fail("should not be parsed");
-        } catch (JSQLParserException ex) {
-            //expected to fail
-        }
-    }
-
+//    @Test
+//    public void testWhereIssue240_notBoolean() {
+//        try {
+//            CCJSqlParserUtil.parse("SELECT count(*) FROM mytable WHERE 5");
+//            fail("should not be parsed");
+//        } catch (JSQLParserException ex) {
+//            //expected to fail
+//        }
+//    }
     @Test
     public void testWhereIssue240_true() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT count(*) FROM mytable WHERE true");
@@ -3318,12 +3317,37 @@ public void testTopKeyWord3() throws JSQLParserException {
 
     @Test
     public void testNotProblem1() throws JSQLParserException {
-        assertSqlCanBeParsedAndDeparsed("SELECT * FROM col WHERE NOT v IN (1, 2, 3, 4, 5, 6, 7)");
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM mytab WHERE NOT v IN (1, 2, 3, 4, 5, 6, 7)");
     }
 
     @Test
     public void testNotProblem2() throws JSQLParserException {
-        assertSqlCanBeParsedAndDeparsed("SELECT * FROM col WHERE NOT func(5)");
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM mytab WHERE NOT func(5)");
+    }
+
+    @Test
+    public void testCaseThenCondition() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM mytable WHERE CASE WHEN a = 'c' THEN a IN (1, 2, 3) END = 1");
+    }
+
+    @Test
+    public void testCaseThenCondition2() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM mytable WHERE CASE WHEN a = 'c' THEN a IN (1, 2, 3) END");
+    }
+
+    @Test
+    public void testCaseThenCondition3() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT CASE WHEN a > 0 THEN b + a ELSE 0 END p FROM mytable");
+    }
+
+    @Test
+    public void testCaseThenCondition4() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM col WHERE CASE WHEN a = 'c' THEN a IN (SELECT id FROM mytable) END");
+    }
+
+    @Test
+    public void testCaseThenCondition5() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM col WHERE CASE WHEN a = 'c' THEN a IN (SELECT id FROM mytable) ELSE b IN (SELECT id FROM mytable) END");
     }
 
     @Test