Author: wumpz

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

@@ -2149,6 +2149,22 @@ Expression Condition():
     { return not?new NotExpression(result):result; }
 }
 
+Expression LightCondition():
+{
+    Expression result;
+    Token token;
+    boolean not = false;
+}
+{
+    [ <K_NOT> { not = true; }]
+    (
+        LOOKAHEAD(RegularCondition()) result=RegularCondition()
+        | result=SimpleExpression()
+    )
+
+    { return not?new NotExpression(result):result; }
+}
+
 Expression RegularCondition() #RegularCondition:
 {
     Expression result = null;
@@ -2349,6 +2365,20 @@ ExpressionList SimpleExpressionList() #ExpressionList:
     }
 }
 
+ExpressionList ConditionExpressionList() #ExpressionList:
+{
+    ExpressionList retval = new ExpressionList();
+    List<Expression> expressions = new ArrayList<Expression>();
+    Expression expr = null;
+}
+{
+    expr=Condition() { expressions.add(expr); } ("," expr=Condition() { expressions.add(expr); })*
+    {
+        retval.setExpressions(expressions);
+        return retval;
+    }
+}
+
 // trim( [leading|trailing|both] expr from expr)
 // The [leading|trailing|both] token has already been consumed
 NamedExpressionList NamedExpressionList1():
@@ -2678,7 +2708,7 @@ Expression PrimaryExpression() #PrimaryExpression:
 
 	| LOOKAHEAD(2) retval = IntervalExpression()
 
-    | retval=Column()
+    | retval=Column() 
 
     | LOOKAHEAD("(" SimpleExpression() ")") "(" retval=SimpleExpression() ")" {retval = new Parenthesis(retval); }
 
@@ -3071,15 +3101,17 @@ Function Function() #Function:
     funcName=RelObjectNameExt()
 
     [ "." tmp=RelObjectNameExt() { funcName+= "." + tmp; } ["." tmp=RelObjectNameExt() { funcName+= "." + tmp; }]]
-    "(" [ [<K_DISTINCT> { retval.setDistinct(true); } | <K_ALL> { retval.setAllColumns(true); }]
+    "(" [ [ LOOKAHEAD(2)(<K_DISTINCT> { retval.setDistinct(true); } | <K_ALL> { retval.setAllColumns(true); }) ]
         ( LOOKAHEAD(4)
+            "*" { retval.setAllColumns(true); }
+            |
 			namedExpressionList=NamedExpressionList1()
 			| 
 			LOOKAHEAD(NamedExpressionListExprFirst()) namedExpressionList = NamedExpressionListExprFirst()
-			|
-			LOOKAHEAD(3) expressionList=SimpleExpressionList()
 			| 
-			"*" { retval.setAllColumns(true); }
+            LOOKAHEAD(SimpleExpressionList()) expressionList=SimpleExpressionList()
+            //| 
+            //LOOKAHEAD(ConditionExpressionList()) expressionList=ConditionExpressionList()
 			|  
 			expr = SubSelect() { expr.setUseBrackets(false); expressionList = new ExpressionList(expr); } 
         )] 

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

@@ -26,13 +26,24 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import org.junit.Before;
 import org.junit.Ignore;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TestName;
 
 public class SelectTest {
 
+    @Rule
+    public TestName name = new TestName();
+
     private final CCJSqlParserManager parserManager = new CCJSqlParserManager();
 
+    @Before
+    public void setup() {
+        System.out.println(name.getMethodName());
+    }
+
     // From statement multipart
     @Test
     public void testMultiPartTableNameWithServerNameAndDatabaseNameAndSchemaName() throws Exception {
@@ -3361,6 +3372,21 @@ public void testOptimizeForIssue348() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT * FROM EMP ORDER BY SALARY DESC OPTIMIZE FOR 20 ROWS");
     }
 
+    @Test
+    public void testFuncConditionParameter() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT func(a < b)");
+    }
+
+    @Test
+    public void testFuncConditionParameter2() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT func(a < b, c)");
+    }
+
+    @Test
+    public void testFuncConditionParameter3() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT CAST((MAX(CAST(IIF(isnumeric(license_no) = 1, license_no, 0) AS INT )) + 2) as varchar) FROM lcps.t_license WHERE profession_id = 60 and license_type = 100 and YEAR(issue_date) % 2 = case when YEAR(issue_date) % 2 = 0 then 0 else 1 end and ISNUMERIC(license_no) = 1");
+    }
+
     @Test
     public void testRawStringExpressionIssue656() throws JSQLParserException {
         for (String c : new String[]{"u", "e", "n", "r", "b", "rb"}) {