Author: wumpz

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

@@ -174,6 +174,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_HAVING:"HAVING">
 |   <K_HIGH_PRIORITY : "HIGH_PRIORITY">
 |   <K_IF:"IF">
+|   <K_IIF:"IIF">
 |   <K_IGNORE : "IGNORE">
 |   <K_ILIKE:"ILIKE">
 |   <K_IN:"IN">
@@ -2691,6 +2692,8 @@ Expression PrimaryExpression() #PrimaryExpression:
 
     | LOOKAHEAD(JsonExpression()) retval=JsonExpression()
 
+    | LOOKAHEAD(FunctionWithCondParams()) retval = FunctionWithCondParams()
+
     | LOOKAHEAD(Function()) retval=Function()
 
     | token=<S_DOUBLE>  { retval = new DoubleValue(token.image); }
@@ -3081,6 +3084,28 @@ Execute Execute(): {
     }
 }
 
+Function FunctionWithCondParams() #Function: {
+    Function retval = new Function();
+    String funcName = null;
+    ExpressionList expressionList = null;
+    Token token = null;
+}
+{
+    (token = <K_IF> | token = <K_IIF>) { funcName=token.image; }
+
+    "(" 
+        expressionList=ConditionExpressionList()
+	")"
+
+    {
+        retval.setParameters(expressionList);
+        retval.setName(funcName);
+        linkAST(retval,jjtThis);
+        return retval;
+    }
+} 
+
+
 Function Function() #Function:
 {
     Function retval = new Function();
@@ -3109,7 +3134,7 @@ Function Function() #Function:
 			| 
 			LOOKAHEAD(NamedExpressionListExprFirst()) namedExpressionList = NamedExpressionListExprFirst()
 			| 
-            LOOKAHEAD(SimpleExpressionList()) expressionList=SimpleExpressionList()
+            LOOKAHEAD(3) expressionList=SimpleExpressionList()
             //| 
             //LOOKAHEAD(ConditionExpressionList()) expressionList=ConditionExpressionList()
 			|  

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

@@ -3374,17 +3374,17 @@ public void testOptimizeForIssue348() throws JSQLParserException {
 
     @Test
     public void testFuncConditionParameter() throws JSQLParserException {
-        assertSqlCanBeParsedAndDeparsed("SELECT func(a < b)");
+        assertSqlCanBeParsedAndDeparsed("SELECT if(a < b)");
     }
 
     @Test
     public void testFuncConditionParameter2() throws JSQLParserException {
-        assertSqlCanBeParsedAndDeparsed("SELECT func(a < b, c)");
+        assertSqlCanBeParsedAndDeparsed("SELECT if(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");
+        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", true);
     }
 
     @Test