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 "DDC-1515 - Merge from 2.1.x"

Browse source 
This reverts commit bd0fb574e3.
This commit is contained in:
Benjamin Eberlei 2011-12-11 16:11:16 +01:00
parent bd0fb574e3
commit 57970499fd
3 changed files with 2 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
View file

@ -244,7 +244,6 @@ abstract class AbstractHydrator
if (isset($cache[$key]['isMetaColumn'])) { if (isset($cache[$key]['isMetaColumn'])) {
if ( ! isset($rowData[$dqlAlias][$cache[$key]['fieldName']]) || $value !== null) { if ( ! isset($rowData[$dqlAlias][$cache[$key]['fieldName']]) || $value !== null) {
$nonemptyComponents[$dqlAlias] = true;
$rowData[$dqlAlias][$cache[$key]['fieldName']] = $value; $rowData[$dqlAlias][$cache[$key]['fieldName']] = $value;
} }

4
lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
View file

@ -332,9 +332,9 @@ class ObjectHydrator extends AbstractHydrator
// Hydrate the data chunks // Hydrate the data chunks
foreach ($rowData as $dqlAlias => $data) { foreach ($rowData as $dqlAlias => $data) {
$entityName = $this->_rsm->aliasMap[$dqlAlias]; $entityName = $this->_rsm->aliasMap[$dqlAlias];
if (isset($this->_rsm->parentAliasMap[$dqlAlias])) { if (isset($this->_rsm->parentAliasMap[$dqlAlias])) {
// It's a joined result // It's a joined result
$parentAlias = $this->_rsm->parentAliasMap[$dqlAlias]; $parentAlias = $this->_rsm->parentAliasMap[$dqlAlias];
// we need the $path to save into the identifier map which entities were already // we need the $path to save into the identifier map which entities were already

64
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php
View file

@ -1,64 +0,0 @@
<?php
namespace Doctrine\Tests\ORM\Functional\Ticket;
/**
* @group DDC-1515
*/
class DDC1515Test extends \Doctrine\Tests\OrmFunctionalTestCase
{
public function setUp()
{
parent::setUp();
$this->_schemaTool->createSchema(array(
$this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1515Foo'),
$this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1515Bar'),
));
}
public function testIssue()
{
$bar = new DDC1515Bar();
$this->_em->persist($bar);
$this->_em->flush();
$foo = new DDC1515Foo();
$foo->bar = $bar;
$this->_em->persist($foo);
$this->_em->flush();
$this->_em->clear();
$bar = $this->_em->find(__NAMESPACE__ . '\DDC1515Bar', $bar->id);
$this->assertInstanceOf(__NAMESPACE__.'\DDC1515Foo', $bar->foo);
}
}
/**
* @Entity
*/
class DDC1515Foo
{
/**
* @OneToOne(targetEntity="DDC1515Bar", inversedBy="foo") @Id
*/
public $bar;
}
/**
* @Entity
*/
class DDC1515Bar
{
/**
* @Id @Column(type="integer") @GeneratedValue
*/
public $id;
/**
* @OneToOne(targetEntity="DDC1515Foo", mappedBy="bar")
*/
public $foo;
}