distinct() updates QueryBuilder state correctly

Previously calling distinct() when the QueryBuilder was in clean state would cause subsequent getDQL() calls to ignore the distinct queryPart Fixes #10784
doctrine · Jun 25, 2023 · efb50b9 · efb50b9
1 parent f76bab2
commit efb50b9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/lib/Doctrine/ORM/QueryBuilder.php b/lib/Doctrine/ORM/QueryBuilder.php
@@ -809,7 +809,12 @@ public function select($select = null)
      */
     public function distinct($flag = true)
     {
-        $this->dqlParts['distinct'] = (bool) $flag;
+        $flag = (bool) $flag;
+
+        if ($this->dqlParts['distinct'] !== $flag) {
+            $this->dqlParts['distinct'] = $flag;
+            $this->state                = self::STATE_DIRTY;
+        }
 
         return $this;
     }

diff --git a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php
@@ -1087,6 +1087,18 @@ public function testAddDistinct(): void
         self::assertEquals('SELECT DISTINCT u FROM Doctrine\Tests\Models\CMS\CmsUser u', $qb->getDQL());
     }
 
+    public function testDistinctUpdatesState(): void
+    {
+        $qb = $this->entityManager->createQueryBuilder()
+            ->select('u')
+            ->from(CmsUser::class, 'u');
+
+        $qb->getDQL();
+        $qb->distinct();
+
+        self::assertEquals('SELECT DISTINCT u FROM Doctrine\Tests\Models\CMS\CmsUser u', $qb->getDQL());
+    }
+
     /** @group DDC-2192 */
     public function testWhereAppend(): void
     {