Skip to content

Commit 74ef282

Browse files
greg0iregreg0ire
authored
Merge pull request #11582 from doctrine/2.19.x-merge-up-into-2.20.x_0oKsBvVN
Merge release 2.19.7 into 2.20.x
2 parents 7d01f19 + 168ac31 commit 74ef282

File tree

10 files changed

+389
-15
lines changed

10 files changed

+389
-15
lines changed

‎docs/en/reference/working-with-objects.rst

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,10 +338,11 @@ Performance of different deletion strategies
338338
Deleting an object with all its associated objects can be achieved
339339
in multiple ways with very different performance impacts.
340340

341-
1. If an association is marked as ``CASCADE=REMOVE`` Doctrine ORM
342-
will fetch this association. If its a Single association it will
343-
pass this entity to
344-
``EntityManager#remove()``. If the association is a collection, Doctrine will loop over all its elements and pass them to``EntityManager#remove()``.
341+
1. If an association is marked as ``CASCADE=REMOVE`` Doctrine ORM will
342+
fetch this association. If it's a Single association it will pass
343+
this entity to ``EntityManager#remove()``. If the association is a
344+
collection, Doctrine will loop over all its elements and pass them to
345+
``EntityManager#remove()``.
345346
In both cases the cascade remove semantics are applied recursively.
346347
For large object graphs this removal strategy can be very costly.
347348
2. Using a DQL ``DELETE`` statement allows you to delete multiple

‎src/NativeQuery.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,15 @@ protected function _doExecute()
5050
$types = [];
5151

5252
foreach ($this->getParameters() as $parameter) {
53-
$name = $parameter->getName();
53+
$name = $parameter->getName();
54+
55+
if ($parameter->typeWasSpecified()) {
56+
$parameters[$name] = $parameter->getValue();
57+
$types[$name] = $parameter->getType();
58+
59+
continue;
60+
}
61+
5462
$value = $this->processParameterValue($parameter->getValue());
5563
$type = $parameter->getValue() === $value
5664
? $parameter->getType()

‎src/Persisters/Collection/OneToManyPersister.php

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,13 @@
1313
use Doctrine\ORM\PersistentCollection;
1414
use Doctrine\ORM\Utility\PersisterHelper;
1515

16+
use function array_fill;
17+
use function array_keys;
1618
use function array_merge;
1719
use function array_reverse;
1820
use function array_values;
1921
use function assert;
22+
use function count;
2023
use function implode;
2124
use function is_int;
2225
use function is_string;
@@ -194,9 +197,12 @@ private function deleteEntityCollection(PersistentCollection $collection): int
194197

195198
if ($targetClass->isInheritanceTypeSingleTable()) {
196199
$discriminatorColumn = $targetClass->getDiscriminatorColumn();
197-
$statement .= ' AND ' . $discriminatorColumn['name'] . ' = ?';
198-
$parameters[] = $targetClass->discriminatorValue;
199-
$types[] = $discriminatorColumn['type'];
200+
$discriminatorValues = $targetClass->discriminatorValue ? [$targetClass->discriminatorValue] : array_keys($targetClass->discriminatorMap);
201+
$statement .= ' AND ' . $discriminatorColumn['name'] . ' IN (' . implode(', ', array_fill(0, count($discriminatorValues), '?')) . ')';
202+
foreach ($discriminatorValues as $discriminatorValue) {
203+
$parameters[] = $discriminatorValue;
204+
$types[] = $discriminatorColumn['type'];
205+
}
200206
}
201207

202208
$numAffected = $this->conn->executeStatement($statement, $parameters, $types);

‎src/Persisters/Entity/BasicEntityPersister.php

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -832,17 +832,42 @@ public function loadOneToOneEntity(array $assoc, $sourceEntity, array $identifie
832832

833833
$computedIdentifier = [];
834834

835+
/** @var array<string,mixed>|null $sourceEntityData */
836+
$sourceEntityData = null;
837+
835838
// TRICKY: since the association is specular source and target are flipped
836839
foreach ($owningAssoc['targetToSourceKeyColumns'] as $sourceKeyColumn => $targetKeyColumn) {
837840
if (! isset($sourceClass->fieldNames[$sourceKeyColumn])) {
838-
throw MappingException::joinColumnMustPointToMappedField(
839-
$sourceClass->name,
840-
$sourceKeyColumn
841-
);
842-
}
841+
// The likely case here is that the column is a join column
842+
// in an association mapping. However, there is no guarantee
843+
// at this point that a corresponding (generally identifying)
844+
// association has been mapped in the source entity. To handle
845+
// this case we directly reference the column-keyed data used
846+
// to initialize the source entity before throwing an exception.
847+
$resolvedSourceData = false;
848+
if (! isset($sourceEntityData)) {
849+
$sourceEntityData = $this->em->getUnitOfWork()->getOriginalEntityData($sourceEntity);
850+
}
851+
852+
if (isset($sourceEntityData[$sourceKeyColumn])) {
853+
$dataValue = $sourceEntityData[$sourceKeyColumn];
854+
if ($dataValue !== null) {
855+
$resolvedSourceData = true;
856+
$computedIdentifier[$targetClass->getFieldForColumn($targetKeyColumn)] =
857+
$dataValue;
858+
}
859+
}
843860

844-
$computedIdentifier[$targetClass->getFieldForColumn($targetKeyColumn)] =
845-
$sourceClass->reflFields[$sourceClass->fieldNames[$sourceKeyColumn]]->getValue($sourceEntity);
861+
if (! $resolvedSourceData) {
862+
throw MappingException::joinColumnMustPointToMappedField(
863+
$sourceClass->name,
864+
$sourceKeyColumn
865+
);
866+
}
867+
} else {
868+
$computedIdentifier[$targetClass->getFieldForColumn($targetKeyColumn)] =
869+
$sourceClass->reflFields[$sourceClass->fieldNames[$sourceKeyColumn]]->getValue($sourceEntity);
870+
}
846871
}
847872

848873
$targetEntity = $this->load($computedIdentifier, null, $assoc);

‎tests/Tests/Models/OneToOneInverseSideWithAssociativeIdLoad/InverseSide.php

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\Tests\Models\OneToOneInverseSideWithAssociativeIdLoad;
6+
7+
use Doctrine\ORM\Mapping\Entity;
8+
use Doctrine\ORM\Mapping\Id;
9+
use Doctrine\ORM\Mapping\JoinColumn;
10+
use Doctrine\ORM\Mapping\OneToOne;
11+
use Doctrine\ORM\Mapping\Table;
12+
13+
/**
14+
* @Entity()
15+
* @Table(name="one_to_one_inverse_side_assoc_id_load_inverse")
16+
*/
17+
class InverseSide
18+
{
19+
/**
20+
* Associative id (owning identifier)
21+
*
22+
* @var InverseSideIdTarget
23+
* @Id()
24+
* @OneToOne(targetEntity=InverseSideIdTarget::class, inversedBy="inverseSide")
25+
* @JoinColumn(nullable=false, name="associativeId")
26+
*/
27+
public $associativeId;
28+
29+
/**
30+
* @var OwningSide
31+
* @OneToOne(targetEntity=OwningSide::class, mappedBy="inverse")
32+
*/
33+
public $owning;
34+
}

‎tests/Tests/Models/OneToOneInverseSideWithAssociativeIdLoad/InverseSideIdTarget.php

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\Tests\Models\OneToOneInverseSideWithAssociativeIdLoad;
6+
7+
use Doctrine\ORM\Mapping\Column;
8+
use Doctrine\ORM\Mapping\Entity;
9+
use Doctrine\ORM\Mapping\GeneratedValue;
10+
use Doctrine\ORM\Mapping\Id;
11+
use Doctrine\ORM\Mapping\OneToOne;
12+
use Doctrine\ORM\Mapping\Table;
13+
14+
/**
15+
* @Entity()
16+
* @Table(name="one_to_one_inverse_side_assoc_id_load_inverse_id_target")
17+
*/
18+
class InverseSideIdTarget
19+
{
20+
/**
21+
* @var string
22+
* @Id()
23+
* @Column(type="string", length=255)
24+
* @GeneratedValue(strategy="NONE")
25+
*/
26+
public $id;
27+
28+
/**
29+
* @var InverseSide
30+
* @OneToOne(targetEntity=InverseSide::class, mappedBy="associativeId")
31+
*/
32+
public $inverseSide;
33+
}

‎tests/Tests/Models/OneToOneInverseSideWithAssociativeIdLoad/OwningSide.php

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\Tests\Models\OneToOneInverseSideWithAssociativeIdLoad;
6+
7+
use Doctrine\ORM\Mapping\Column;
8+
use Doctrine\ORM\Mapping\Entity;
9+
use Doctrine\ORM\Mapping\GeneratedValue;
10+
use Doctrine\ORM\Mapping\Id;
11+
use Doctrine\ORM\Mapping\JoinColumn;
12+
use Doctrine\ORM\Mapping\OneToOne;
13+
use Doctrine\ORM\Mapping\Table;
14+
15+
/**
16+
* @Entity()
17+
* @Table(name="one_to_one_inverse_side_assoc_id_load_owning")
18+
*/
19+
class OwningSide
20+
{
21+
/**
22+
* @var string
23+
* @Id()
24+
* @Column(type="string", length=255)
25+
* @GeneratedValue(strategy="NONE")
26+
*/
27+
public $id;
28+
29+
/**
30+
* Owning side
31+
*
32+
* @var InverseSide
33+
* @OneToOne(targetEntity=InverseSide::class, inversedBy="owning")
34+
* @JoinColumn(name="inverse", referencedColumnName="associativeId")
35+
*/
36+
public $inverse;
37+
}

‎tests/Tests/ORM/Functional/OneToOneInverseSideWithAssociativeIdLoadAfterDqlQueryTest.php

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\Tests\ORM\Functional;
6+
7+
use Doctrine\Tests\Models\OneToOneInverseSideWithAssociativeIdLoad\InverseSide;
8+
use Doctrine\Tests\Models\OneToOneInverseSideWithAssociativeIdLoad\InverseSideIdTarget;
9+
use Doctrine\Tests\Models\OneToOneInverseSideWithAssociativeIdLoad\OwningSide;
10+
use Doctrine\Tests\OrmFunctionalTestCase;
11+
12+
use function assert;
13+
14+
class OneToOneInverseSideWithAssociativeIdLoadAfterDqlQueryTest extends OrmFunctionalTestCase
15+
{
16+
protected function setUp(): void
17+
{
18+
parent::setUp();
19+
20+
$this->createSchemaForModels(OwningSide::class, InverseSideIdTarget::class, InverseSide::class);
21+
}
22+
23+
/** @group GH-11108 */
24+
public function testInverseSideWithAssociativeIdOneToOneLoadedAfterDqlQuery(): void
25+
{
26+
$owner = new OwningSide();
27+
$inverseId = new InverseSideIdTarget();
28+
$inverse = new InverseSide();
29+
30+
$owner->id = 'owner';
31+
$inverseId->id = 'inverseId';
32+
$inverseId->inverseSide = $inverse;
33+
$inverse->associativeId = $inverseId;
34+
$owner->inverse = $inverse;
35+
$inverse->owning = $owner;
36+
37+
$this->_em->persist($owner);
38+
$this->_em->persist($inverseId);
39+
$this->_em->persist($inverse);
40+
$this->_em->flush();
41+
$this->_em->clear();
42+
43+
$fetchedInverse = $this
44+
->_em
45+
->createQueryBuilder()
46+
->select('inverse')
47+
->from(InverseSide::class, 'inverse')
48+
->andWhere('inverse.associativeId = :associativeId')
49+
->setParameter('associativeId', 'inverseId')
50+
->getQuery()
51+
->getSingleResult();
52+
assert($fetchedInverse instanceof InverseSide);
53+
54+
self::assertInstanceOf(InverseSide::class, $fetchedInverse);
55+
self::assertInstanceOf(InverseSideIdTarget::class, $fetchedInverse->associativeId);
56+
self::assertInstanceOf(OwningSide::class, $fetchedInverse->owning);
57+
58+
$this->assertSQLEquals(
59+
'select o0_.associativeid as associativeid_0 from one_to_one_inverse_side_assoc_id_load_inverse o0_ where o0_.associativeid = ?',
60+
$this->getLastLoggedQuery(1)['sql']
61+
);
62+
63+
$this->assertSQLEquals(
64+
'select t0.id as id_1, t0.inverse as inverse_2 from one_to_one_inverse_side_assoc_id_load_owning t0 where t0.inverse = ?',
65+
$this->getLastLoggedQuery()['sql']
66+
);
67+
}
68+
}

0 commit comments

Comments
 (0)