RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Revert "Merge branch 'fix/#6499-#6533-fix-commit-order-calculation-consider-all-join-column-fields'"

Browse source 
This reverts commit 2a58645cb5, reversing
changes made to 6d428c90e2.
This commit is contained in:
Marco Pivetta 2017-08-11 22:29:45 +02:00
parent 2a58645cb5
commit a0c0d3bf2a
No known key found for this signature in database
GPG key ID: 4167D3337FD9D629
2 changed files with 1 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Doctrine/ORM/UnitOfWork.php
View file

@ -1154,11 +1154,7 @@ class UnitOfWork implements PropertyChangedListener
$joinColumns = reset($assoc['joinColumns']); $joinColumns = reset($assoc['joinColumns']);
$calc->addDependency( $calc->addDependency($targetClass->name, $class->name, (int)empty($joinColumns['nullable']));
$targetClass->name,
$class->name,
(int) (($joinColumns['nullable'] ?? true) === false)
);
// If the target class has mapped subclasses, these share the same dependency. // If the target class has mapped subclasses, these share the same dependency.
if ( ! $targetClass->subClasses) { if ( ! $targetClass->subClasses) {

96
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6499Test.php
View file

@ -1,96 +0,0 @@
<?php
namespace Doctrine\Tests\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* @group #6499
*
*
* Specifically, DDC6499B has a dependency on DDC6499A, and DDC6499A
* has a dependency on DDC6499B. Since DDC6499A#b is not nullable,
* the DDC6499B should be inserted first.
*/
class DDC6499Test extends OrmFunctionalTestCase
{
/**
* {@inheritDoc}
*/
protected function setUp() : void
{
parent::setUp();
$this->_schemaTool->createSchema([
$this->_em->getClassMetadata(DDC6499A::class),
$this->_em->getClassMetadata(DDC6499B::class),
]);
}
/**
* {@inheritDoc}
*/
protected function tearDown() : void
{
parent::tearDown();
$this->_schemaTool->dropSchema([
$this->_em->getClassMetadata(DDC6499A::class),
$this->_em->getClassMetadata(DDC6499B::class),
]);
}
public function testIssue() : void
{
$b = new DDC6499B();
$a = new DDC6499A();
$this->_em->persist($a);
$a->b = $b;
$this->_em->persist($b);
$this->_em->flush();
self::assertInternalType('integer', $a->id);
self::assertInternalType('integer', $b->id);
}
public function testIssueReversed() : void
{
$b = new DDC6499B();
$a = new DDC6499A();
$a->b = $b;
$this->_em->persist($b);
$this->_em->persist($a);
$this->_em->flush();
self::assertInternalType('integer', $a->id);
self::assertInternalType('integer', $b->id);
}
}
/** @Entity */
class DDC6499A
{
/** @Id @Column(type="integer") @GeneratedValue */
public $id;
/** @JoinColumn(nullable=false) @OneToOne(targetEntity=DDC6499B::class) */
public $b;
}
/** @Entity */
class DDC6499B
{
/** @Id @Column(type="integer") @GeneratedValue */
public $id;
/** @ManyToOne(targetEntity="DDC6499A") */
private $a;
}