Add failing test for failing to update child-parent relation when the child has been prefetched in QB

Author: simPod

tests/Doctrine/Tests/Models/GH7212/GH7212Child.php

@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\GH7212;
+
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\Entity;
+use Doctrine\ORM\Mapping\Id;
+use Doctrine\ORM\Mapping\ManyToOne;
+
+/** @Entity */
+class GH7212Child
+{
+    /**
+     * @Column(type="integer")
+     * @Id
+     * @var int
+     */
+    private $id;
+
+    /**
+     * @ManyToOne(targetEntity=GH7212Parent::class, inversedBy="children")
+     * @var GH7212Parent|null
+     */
+    private $parent;
+
+    public function __construct(int $id, ?GH7212Parent $parent = null)
+    {
+        $this->id = $id;
+
+        $this->setParent($parent);
+    }
+
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    public function getParent(): ?GH7212Parent
+    {
+        return $this->parent;
+    }
+
+    public function setParent(?GH7212Parent $parent): void
+    {
+        $this->parent = $parent;
+    }
+}

tests/Doctrine/Tests/Models/GH7212/GH7212Parent.php

@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\GH7212;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\Entity;
+use Doctrine\ORM\Mapping\Id;
+use Doctrine\ORM\Mapping\OneToMany;
+
+/** @Entity */
+class GH7212Parent
+{
+    /**
+     * @Column(type="integer")
+     * @Id
+     * @var int
+     */
+    private $id;
+
+    /**
+     * @OneToMany(targetEntity=GH7212Child::class, mappedBy="parent", indexBy="id")
+     * @var Collection<int, GH7212Child>
+     */
+    private $children;
+
+    public function __construct(int $id)
+    {
+        $this->id       = $id;
+        $this->children = new ArrayCollection();
+    }
+
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    public function addChild(GH7212Child $child): void
+    {
+        $this->children->set($child->getId(), $child);
+    }
+
+    public function removeChild(GH7212Child $child): void
+    {
+        $this->children->remove($child->getId());
+    }
+
+    /**
+     * @return Collection<int, GH7212Child>
+     */
+    public function getChildren(): Collection
+    {
+        return $this->children;
+    }
+}

tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php

@@ -18,10 +18,13 @@
 use Doctrine\Tests\Models\CMS\CmsGroup;
 use Doctrine\Tests\Models\CMS\CmsPhonenumber;
 use Doctrine\Tests\Models\CMS\CmsUser;
+use Doctrine\Tests\Models\GH7212\GH7212Child;
+use Doctrine\Tests\Models\GH7212\GH7212Parent;
 use Doctrine\Tests\OrmFunctionalTestCase;
 use InvalidArgumentException;
 use RuntimeException;
 
+use function assert;
 use function get_class;
 
 class BasicFunctionalTest extends OrmFunctionalTestCase
@@ -1355,4 +1358,45 @@ public function testItThrowsWhenReferenceUsesIdAssignedByDatabase(): void
         // post insert IDs will be assigned during flush
         $this->_em->flush();
     }
+
+    public function testIndexedRelationUpdatesWhenSelectedUsingLeftJoin(): void
+    {
+        $this->_schemaTool->createSchema(
+            [
+                $this->_em->getClassMetadata(GH7212Parent::class),
+                $this->_em->getClassMetadata(GH7212Child::class),
+            ]
+        );
+
+        $parent = new GH7212Parent(1);
+        $child  = new GH7212Child(1, $parent);
+
+        $this->_em->persist($parent);
+        $this->_em->persist($child);
+
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $parent = $this->_em->createQueryBuilder()
+            ->select('p, c')
+            ->from(GH7212Parent::class, 'p')
+            // Prefetching Child relation using left join
+            ->leftJoin('p.children', 'c')
+            ->getQuery()
+            ->getSingleResult();
+        assert($parent instanceof GH7212Parent);
+
+        $children = $parent->getChildren();
+        foreach ($children as $child) {
+            $child->setParent(null);
+            $parent->removeChild($child);
+        }
+
+        $this->_em->flush();
+
+        $childrenRows = $this->_em->getConnection()->fetchAllAssociative('SELECT * FROM GH7212Child');
+        $this->assertCount(1, $childrenRows);
+        $this->assertSame('1', $childrenRows[0]['id']);
+        $this->assertNull($childrenRows[0]['parent_id']);
+    }
 }