Fixed exception that is thrown when combining the sqlite CONCAT_WS ex…

…tension with a LimitSubqueryOutputWalker
packagist · Dec 5, 2019 · af72c4a · af72c4a
1 parent fccc6a9
commit af72c4a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/Query/Sqlite/ConcatWs.php b/src/Query/Sqlite/ConcatWs.php
@@ -55,14 +55,14 @@ public function parse(\Doctrine\ORM\Query\Parser $parser)
 
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        $separator = array_shift($this->values)->simpleArithmeticExpression->value;
+        $separator = $this->values[0]->simpleArithmeticExpression->value;
 
         // Create an array to hold the query elements.
         $queryBuilder = ['('];
 
         // Iterate over the captured expressions and add them to the query.
-        for ($i = 0; $i < count($this->values); $i++) {
-            if ($i > 0) {
+        for ($i = 1; $i < count($this->values); $i++) {
+            if ($i > 1) {
                 $queryBuilder[] = " || '${separator}' || ";
             }
 

diff --git a/tests/Query/Sqlite/ConcatWsTest.php b/tests/Query/Sqlite/ConcatWsTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace DoctrineExtensions\Tests\Query\Sqlite;
+
+use DoctrineExtensions\Tests\Query\SqliteTestCase;
+
+class ConcatWsTest extends SqliteTestCase
+{
+    public function testConcatWs()
+    {
+        $dql = "SELECT CONCAT_WS(',', p.id, p.name) FROM DoctrineExtensions\\Tests\\Entities\\Product p";
+
+        $this->assertEquals(
+            "SELECT (IFNULL(p0_.id, '') || ',' || IFNULL(p0_.name, '')) AS {$this->columnAlias} FROM Product p0_",
+            $this->entityManager->createQuery($dql)->getSql()
+        );
+    }
+}