From 3630e06b847a398816b44c0886774861f39a9ee7 Mon Sep 17 00:00:00 2001 From: "Roman S. Borschel" Date: Sun, 8 Aug 2010 12:40:21 +0200 Subject: [PATCH] [DDC-522][DDC-419][DDC-383] Fixed. --- .../AbstractEntityInheritancePersister.php | 8 +- .../ORM/Persisters/BasicEntityPersister.php | 8 +- lib/Doctrine/ORM/UnitOfWork.php | 2 +- .../ORM/Functional/Ticket/DDC522Test.php | 104 ++++++++++++++++++ 4 files changed, 117 insertions(+), 5 deletions(-) create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php diff --git a/lib/Doctrine/ORM/Persisters/AbstractEntityInheritancePersister.php b/lib/Doctrine/ORM/Persisters/AbstractEntityInheritancePersister.php index 0515e4dc0..9be6de464 100644 --- a/lib/Doctrine/ORM/Persisters/AbstractEntityInheritancePersister.php +++ b/lib/Doctrine/ORM/Persisters/AbstractEntityInheritancePersister.php @@ -74,8 +74,12 @@ abstract class AbstractEntityInheritancePersister extends BasicEntityPersister $class = $this->_declaringClassMap[$column]; if ($class->name == $entityName || is_subclass_of($entityName, $class->name)) { $field = $class->fieldNames[$realColumnName]; - $data[$field] = Type::getType($class->fieldMappings[$field]['type']) - ->convertToPHPValue($value, $this->_platform); + if (isset($data[$field])) { + $data[$realColumnName] = $value; + } else { + $data[$field] = Type::getType($class->fieldMappings[$field]['type']) + ->convertToPHPValue($value, $this->_platform); + } } } else { $data[$realColumnName] = $value; diff --git a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php index 8fba4d000..15ce83392 100644 --- a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php @@ -800,8 +800,12 @@ class BasicEntityPersister $column = $this->_resultColumnNames[$column]; if (isset($this->_class->fieldNames[$column])) { $field = $this->_class->fieldNames[$column]; - $data[$field] = Type::getType($this->_class->fieldMappings[$field]['type']) - ->convertToPHPValue($value, $this->_platform); + if (isset($data[$field])) { + $data[$column] = $value; + } else { + $data[$field] = Type::getType($this->_class->fieldMappings[$field]['type']) + ->convertToPHPValue($value, $this->_platform); + } } else { $data[$column] = $value; } diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 2d8cd1885..916952850 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -1870,7 +1870,7 @@ class UnitOfWork implements PropertyChangedListener doctrine_populate_data($entity, $data); } else { foreach ($data as $field => $value) { - if (isset($class->reflFields[$field])) { + if (isset($class->fieldMappings[$field])) { $class->reflFields[$field]->setValue($entity, $value); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php new file mode 100644 index 000000000..dbfa024ca --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php @@ -0,0 +1,104 @@ +_schemaTool->createSchema(array( + $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC522Customer'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC522Cart'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC522ForeignKeyTest') + )); + } catch(\Exception $e) { + + } + } + + /** + * @group DDC-522 + */ + public function testJoinColumnWithSameNameAsAssociationField() + { + //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); + + $cust = new DDC522Customer; + $cust->name = "name"; + $cart = new DDC522Cart; + $cart->total = 0; + $cust->cart = $cart; + $cart->customer = $cust; + $this->_em->persist($cust); + $this->_em->persist($cart); + $this->_em->flush(); + + $this->_em->clear(); + + $r = $this->_em->createQuery("select ca,c from ".get_class($cart)." ca join ca.customer c") + ->getResult(); + + $this->assertTrue($r[0] instanceof DDC522Cart); + $this->assertTrue($r[0]->customer instanceof DDC522Customer); + $this->assertFalse($r[0]->customer instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertEquals('name', $r[0]->customer->name); + + $fkt = new DDC522ForeignKeyTest(); + $fkt->cartId = $r[0]->id; // ignored for persistence + $fkt->cart = $r[0]; // must be set properly + $this->_em->persist($fkt); + $this->_em->flush(); + $this->_em->clear(); + + $fkt2 = $this->_em->find(get_class($fkt), $fkt->id); + $this->assertEquals($fkt->cart->id, $fkt2->cartId); + $this->assertTrue($fkt2->cart instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertFalse($fkt2->cart->__isInitialized__); + } +} + +/** @Entity */ +class DDC522Customer { + /** @Id @Column(type="integer") @GeneratedValue */ + public $id; + /** @Column */ + public $name; + /** @OneToOne(targetEntity="DDC522Cart", mappedBy="customer") */ + public $cart; +} + +/** @Entity */ +class DDC522Cart { + /** @Id @Column(type="integer") @GeneratedValue */ + public $id; + /** @Column(type="integer") */ + public $total; + /** + * @OneToOne(targetEntity="DDC522Customer", inversedBy="cart") + * @JoinColumn(name="customer", referencedColumnName="id") + */ + public $customer; +} + +/** @Entity */ +class DDC522ForeignKeyTest { + /** @Id @Column(type="integer") @GeneratedValue */ + public $id; + /** @Column(type="integer", name="cart_id") */ + public $cartId; + /** + * @OneToOne(targetEntity="DDC522Cart") + * @JoinColumn(name="cart_id", referencedColumnName="id") + */ + public $cart; +}