StringAgg now allow sub-request/function as first parameter

src/Query/Postgresql/StringAgg.php

@@ -11,6 +11,7 @@
 /**
  * @author Roberto Júnior <[email protected]>
  * @author Vaskevich Eugeniy <[email protected]>
+ * @author Allan Simon <[email protected]>
  */
 class StringAgg extends FunctionNode
 {
@@ -34,7 +35,7 @@ public function parse(Parser $parser): void
             $this->isDistinct = true;
         }
 
-        $this->expression = $parser->PathExpression(PathExpression::TYPE_STATE_FIELD);
+        $this->expression = $parser->ArithmeticPrimary();
         $parser->match(Lexer::T_COMMA);
         $this->delimiter = $parser->StringPrimary();
 
@@ -50,7 +51,7 @@ public function getSql(SqlWalker $sqlWalker): string
         return \sprintf(
             'string_agg(%s%s, %s%s)',
             ($this->isDistinct ? 'DISTINCT ' : ''),
-            $sqlWalker->walkPathExpression($this->expression),
+            $this->expression->dispatch($sqlWalker),
             $sqlWalker->walkStringPrimary($this->delimiter),
             ($this->orderBy ? $sqlWalker->walkOrderByClause($this->orderBy) : '')
         );

tests/Query/Postgresql/StringAggTest.php

@@ -71,4 +71,17 @@ public function testStringAggFullDeclaration()
 
         $this->assertEquals($expected, $queryBuilder->getQuery()->getSQL());
     }
+
+    public function testStringAggWithInnerFunction()
+    {
+        $queryBuilder = new QueryBuilder($this->entityManager);
+        $queryBuilder
+            ->select("string_agg(DISTINCT LOWER(bpt.latitude), '-' ORDER BY bpt.latitude DESC)")
+            ->from('DoctrineExtensions\Tests\Entities\BlogPost', 'bpt')
+            ->groupBy('bpt.created');
+
+        $expected = 'SELECT string_agg(DISTINCT LOWER(b0_.latitude), \'-\' ORDER BY b0_.latitude DESC) AS sclr_0 FROM BlogPost b0_ GROUP BY b0_.created';
+
+        $this->assertEquals($expected, $queryBuilder->getQuery()->getSQL());
+    }
 }