- allowed simple expressions in case else

JSQLParser · May 15, 2012 · 54d2c54 · 54d2c54
1 parent 2129603
commit 54d2c54
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj b/src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj
@@ -1432,11 +1432,11 @@ Expression CaseWhenExpression():
 	<K_CASE> 
 	(
     	    ( clause=WhenThenSearchCondition() { whenClauses.add(clause); } )+
-             [<K_ELSE> elseExp=PrimaryExpression()]
+             [<K_ELSE> elseExp=SimpleExpression()]
 		|
 		    switchExp=PrimaryExpression()
              ( clause=WhenThenValue() { whenClauses.add(clause); } )*
-             [<K_ELSE> elseExp=PrimaryExpression()]
+             [<K_ELSE> elseExp=SimpleExpression()]
 	)             
     <K_END>
     { 

diff --git a/src/test/java/net/sf/jsqlparser/test/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/test/select/SelectTest.java
@@ -583,6 +583,11 @@ public void testCastInCast2() throws JSQLParserException {
 		String stmt = "SELECT CAST('test' + CAST(assertEqual AS numeric) AS varchar) FROM tabelle1";
 		assertSqlCanBeParsedAndDeparsed(stmt);
 	}
+
+	public void testCaseElseAddition() throws JSQLParserException  {
+		String stmt = "SELECT CASE WHEN 1 + 3 > 20 THEN 0 ELSE 1000 + 1 END AS d FROM dual";
+		assertSqlCanBeParsedAndDeparsed(stmt);
+	}
 
 	private void assertSqlCanBeParsedAndDeparsed(String statement) throws JSQLParserException {
 		Statement parsed = parserManager.parse(new StringReader(statement));