fixes #605

Author: wumpz

src/main/java/net/sf/jsqlparser/expression/operators/relational/ExpressionList.java

@@ -21,6 +21,7 @@
  */
 package net.sf.jsqlparser.expression.operators.relational;
 
+import java.util.Arrays;
 import java.util.List;
 
 import net.sf.jsqlparser.expression.Expression;
@@ -39,6 +40,10 @@ public ExpressionList() {
     public ExpressionList(List<Expression> expressions) {
         this.expressions = expressions;
     }
+    
+    public ExpressionList(Expression ... expressions) {
+        this.expressions = Arrays.asList(expressions);
+    }
 
     public List<Expression> getExpressions() {
         return expressions;

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

@@ -385,7 +385,9 @@ private void visitBinaryExpression(BinaryExpression binaryExpression, String ope
 
     @Override
     public void visit(SubSelect subSelect) {
-        buffer.append("(");
+        if (subSelect.isUseBrackets()) {
+            buffer.append("(");
+        }
         if (selectVisitor != null) {
             if (subSelect.getWithItemsList() != null) {
                 buffer.append("WITH ");
@@ -402,7 +404,9 @@ public void visit(SubSelect subSelect) {
 
             subSelect.getSelectBody().accept(selectVisitor);
         }
-        buffer.append(")");
+        if (subSelect.isUseBrackets()) {
+            buffer.append(")");
+        }
     }
 
     @Override

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

@@ -2840,14 +2840,16 @@ Function Function() #Function:
     String tmp = null;
     ExpressionList expressionList = null;
     KeepExpression keep = null;
+    SubSelect expr = null;
 }
 {
     ["{fn" { retval.setEscaped(true); } ]
 
     funcName=RelObjectNameExt()
 
     [ "." tmp=RelObjectNameExt() { funcName+= "." + tmp; } ["." tmp=RelObjectNameExt() { funcName+= "." + tmp; }]]
-    "(" [ [<K_DISTINCT> { retval.setDistinct(true); } | <K_ALL> { retval.setAllColumns(true); }] (expressionList=SimpleExpressionList() | "*" { retval.setAllColumns(true); }) ] ")"
+    "(" [ [<K_DISTINCT> { retval.setDistinct(true); } | <K_ALL> { retval.setAllColumns(true); }] (LOOKAHEAD(3) expressionList=SimpleExpressionList() | "*" { retval.setAllColumns(true); }
+        | expr = SubSelect() { expr.setUseBrackets(false); expressionList = new ExpressionList(expr); } ) ] ")"
 
     [ "." tmp=RelObjectName() { retval.setAttribute(tmp); }]
 

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

@@ -2801,4 +2801,12 @@ public void testProblemSqlIssue603() throws JSQLParserException {
     public void testProblemSqlIssue603_2() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT CAST(col1 AS UNSIGNED INTEGER) FROM mytable");
     }
+    
+    public void testProblemSqlFuncParamIssue605() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT p.id, pt.name, array_to_string( array( select pc.name from product_category pc ), ',' ) AS categories FROM product p", true);
+    }
+    
+    public void testProblemSqlFuncParamIssue605_2() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT func(SELECT col1 FROM mytable)");
+    }
 }