Fixes Function Parameter List Brackets issue #1239 (#1240)

Author: manticore-projects

src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java

@@ -112,7 +112,6 @@ public class ExpressionDeParser extends AbstractDeParser<Expression>
 
     private static final String NOT = "NOT ";
     private SelectVisitor selectVisitor;
-    private boolean useBracketsInExprList = true;
     private OrderByDeParser orderByDeParser = new OrderByDeParser();
 
     public ExpressionDeParser() {
@@ -487,20 +486,13 @@ public void visit(Function function) {
         } else if (function.getParameters() == null && function.getNamedParameters() == null) {
             buffer.append("()");
         } else {
-            boolean oldUseBracketsInExprList = useBracketsInExprList;
-            useBracketsInExprList = !function.isDistinct() &&
-                    !function.isAllColumns() &&
-                    function.getOrderByElements() == null;
-            if (!useBracketsInExprList) {
-                buffer.append("(");
-            }
+            buffer.append("(");
             if (function.isDistinct()) {
                 buffer.append("DISTINCT ");
             } else if (function.isAllColumns()) {
                 buffer.append("ALL ");
             } else if (function.isUnique()) {
-                useBracketsInExprList = false;
-                buffer.append("(UNIQUE ");
+                buffer.append("UNIQUE ");
             }
             if (function.getNamedParameters() != null) {
                 visit(function.getNamedParameters());
@@ -522,11 +514,7 @@ public void visit(Function function) {
                     orderByDeParser.deParseElement(orderByElement);
                 }
             }
-            if (!useBracketsInExprList) {
-                buffer.append(")");
-            }
-            useBracketsInExprList = oldUseBracketsInExprList;
-
+            buffer.append(")");
         }
 
         if (function.getAttribute() != null) {
@@ -545,7 +533,7 @@ public void visit(Function function) {
 
     @Override
     public void visit(ExpressionList expressionList) {
-        if (useBracketsInExprList) {
+        if (expressionList.isUsingBrackets()) {
             buffer.append("(");
         }
         for (Iterator<Expression> iter = expressionList.getExpressions().iterator(); iter.hasNext();) {
@@ -555,16 +543,13 @@ public void visit(ExpressionList expressionList) {
                 buffer.append(", ");
             }
         }
-        if (useBracketsInExprList) {
+        if (expressionList.isUsingBrackets()) {
             buffer.append(")");
         }
     }
 
     @Override
     public void visit(NamedExpressionList namedExpressionList) {
-        if (useBracketsInExprList) {
-            buffer.append("(");
-        }
         List<String> names = namedExpressionList.getNames();
         List<Expression> expressions = namedExpressionList.getExpressions();
         for (int i = 0; i < names.size(); i++) {
@@ -578,9 +563,6 @@ public void visit(NamedExpressionList namedExpressionList) {
             }
             expressions.get(i).accept(this);
         }
-        if (useBracketsInExprList) {
-            buffer.append(")");
-        }
     }
 
     public SelectVisitor getSelectVisitor() {

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

@@ -4029,11 +4029,11 @@ Function InternalFunction(Function retval) :
             |
             LOOKAHEAD(NamedExpressionListExprFirst(), { getAsBoolean(Feature.allowComplexParsing) }) namedExpressionList = NamedExpressionListExprFirst()
             |
-            LOOKAHEAD(3, { getAsBoolean(Feature.allowComplexParsing) }) (expressionList=ComplexExpressionList() [ orderByList = OrderByElements() { retval.setOrderByElements(orderByList); } ])
+            LOOKAHEAD(3, { getAsBoolean(Feature.allowComplexParsing) }) (expressionList=ComplexExpressionList() {expressionList.setUsingBrackets(false);} [ orderByList = OrderByElements() { retval.setOrderByElements(orderByList); } ])
             |
-            LOOKAHEAD(3) (expressionList=SimpleExpressionList(true) [ orderByList = OrderByElements() { retval.setOrderByElements(orderByList); } ])
+            LOOKAHEAD(3) (expressionList=SimpleExpressionList(false) [ orderByList = OrderByElements() { retval.setOrderByElements(orderByList); } ])
             |
-            expr = SubSelect() { expr.setUseBrackets(false); expressionList = new ExpressionList(expr); }
+            expr = SubSelect() { expr.setUseBrackets(false); expressionList = new ExpressionList(expr).withUsingBrackets(false); }
 
         )]
         [ <K_IGNORE> <K_NULLS> {retval.setIgnoreNulls(true); }]

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

@@ -4615,5 +4615,10 @@ public void testGroupedByWithExtraBracketsIssue1168() throws JSQLParserException
     public void testSelectRowElement() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT (t.tup).id, (tup).name FROM t WHERE (t.tup).id IN (1, 2, 3)");
     }
+    
+    @Test
+    public void testMissinBracketsNestedInIssue() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT COUNT(DISTINCT CASE WHEN room IN (11167, 12074, 4484, 4483, 6314, 11168, 10336, 16445, 13176, 13177, 13178) THEN uid END) AS uidCount from tableName", true);
+    }
 
 }