RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-26 08:53:20 +03:00
Code Issues Projects Releases Wiki Activity

[2.0][DDC-248] Fixed and some more unrelated tests.

Browse Source
This commit is contained in:
romanb 2010-01-15 13:33:42 +00:00
parent d060a48cb4
commit 0a9876b2e8
2 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Doctrine/ORM/Mapping/ClassMetadata.php
View File

@ -358,13 +358,23 @@ class ClassMetadata extends ClassMetadataInfo
{ {
// Restore ReflectionClass and properties // Restore ReflectionClass and properties
$this->reflClass = new \ReflectionClass($this->name); $this->reflClass = new \ReflectionClass($this->name);
foreach ($this->fieldNames as $field) { foreach ($this->fieldMappings as $field => $mapping) {
$this->reflFields[$field] = $this->reflClass->getProperty($field); if (isset($mapping['inherited'])) {
$this->reflFields[$field]->setAccessible(true); $reflField = new \ReflectionProperty($mapping['inherited'], $field);
} else {
$reflField = $this->reflClass->getProperty($field);
}
$reflField->setAccessible(true);
$this->reflFields[$field] = $reflField;
} }
foreach ($this->associationMappings as $field => $mapping) { foreach ($this->associationMappings as $field => $mapping) {
$this->reflFields[$field] = $this->reflClass->getProperty($field); if (isset($this->inheritedAssociationFields[$field])) {
$this->reflFields[$field]->setAccessible(true); $reflField = new \ReflectionProperty($this->inheritedAssociationFields[$field], $field);
} else {
$reflField = $this->reflClass->getProperty($field);
}
$reflField->setAccessible(true);
$this->reflFields[$field] = $reflField;
} }
//$this->prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name)); //$this->prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));

32
tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php
View File

@ -87,15 +87,15 @@ class OneToManyBidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctiona
public function testLazyLoadsObjectsOnTheOwningSide() public function testLazyLoadsObjectsOnTheOwningSide()
{ {
$this->_createFixture(); $this->_createFixture();
$metadata = $this->_em->getClassMetadata('Doctrine\Tests\Models\ECommerce\ECommerceProduct');
$metadata->getAssociationMapping('features')->fetchMode = AssociationMapping::FETCH_LAZY;
$query = $this->_em->createQuery('select p from Doctrine\Tests\Models\ECommerce\ECommerceProduct p'); $query = $this->_em->createQuery('select p from Doctrine\Tests\Models\ECommerce\ECommerceProduct p');
$result = $query->getResult(); $result = $query->getResult();
$product = $result[0]; $product = $result[0];
$features = $product->getFeatures(); $features = $product->getFeatures();
$this->assertFalse($features->isInitialized());
$this->assertTrue($features[0] instanceof ECommerceFeature); $this->assertTrue($features[0] instanceof ECommerceFeature);
$this->assertTrue($features->isInitialized());
$this->assertSame($product, $features[0]->getProduct()); $this->assertSame($product, $features[0]->getProduct());
$this->assertEquals('Model writing tutorial', $features[0]->getDescription()); $this->assertEquals('Model writing tutorial', $features[0]->getDescription());
$this->assertTrue($features[1] instanceof ECommerceFeature); $this->assertTrue($features[1] instanceof ECommerceFeature);
@ -106,15 +106,39 @@ class OneToManyBidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctiona
public function testLazyLoadsObjectsOnTheInverseSide() public function testLazyLoadsObjectsOnTheInverseSide()
{ {
$this->_createFixture(); $this->_createFixture();
$metadata = $this->_em->getClassMetadata('Doctrine\Tests\Models\ECommerce\ECommerceFeature');
$metadata->getAssociationMapping('product')->fetchMode = AssociationMapping::FETCH_LAZY;
$query = $this->_em->createQuery('select f from Doctrine\Tests\Models\ECommerce\ECommerceFeature f'); $query = $this->_em->createQuery('select f from Doctrine\Tests\Models\ECommerce\ECommerceFeature f');
$features = $query->getResult(); $features = $query->getResult();
$product = $features[0]->getProduct(); $product = $features[0]->getProduct();
$this->assertTrue($product instanceof \Doctrine\ORM\Proxy\Proxy);
$this->assertTrue($product instanceof ECommerceProduct);
$this->assertFalse($product->__isInitialized__);
$this->assertSame('Doctrine Cookbook', $product->getName());
$this->assertTrue($product->__isInitialized__);
}
public function testLazyLoadsObjectsOnTheInverseSide2()
{
//$this->_em->getConnection()->getConfiguration()->setSqlLogger(new \Doctrine\DBAL\Logging\EchoSqlLogger);
$this->_createFixture();
$query = $this->_em->createQuery('select f,p from Doctrine\Tests\Models\ECommerce\ECommerceFeature f join f.product p');
$features = $query->getResult();
$product = $features[0]->getProduct();
$this->assertFalse($product instanceof \Doctrine\ORM\Proxy\Proxy);
$this->assertTrue($product instanceof ECommerceProduct); $this->assertTrue($product instanceof ECommerceProduct);
$this->assertSame('Doctrine Cookbook', $product->getName()); $this->assertSame('Doctrine Cookbook', $product->getName());
$this->assertFalse($product->getFeatures()->isInitialized());
// This would trigger lazy-load
//$this->assertEquals(2, $product->getFeatures()->count());
//$this->assertTrue($product->getFeatures()->contains($features[0]));
//$this->assertTrue($product->getFeatures()->contains($features[1]));
//$this->_em->getConnection()->getConfiguration()->setSqlLogger(null);
} }
public function testJoinFromOwningSide() public function testJoinFromOwningSide()