RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-06 00:57:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #705 from FabioBatSilva/DDC-2519

Browse Source 
[DDC-2519] Partial association identifier
This commit is contained in:
Guilherme Blanco 2013-06-23 14:25:58 -07:00
commit 2ce72f38a2
3 changed files with 107 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Doctrine/ORM/Query/Parser.php
View File

@ -670,6 +670,12 @@ class Parser
continue; continue;
} }
if (isset($class->associationMappings[$field]) &&
$class->associationMappings[$field]['isOwningSide'] &&
$class->associationMappings[$field]['type'] & ClassMetadata::TO_ONE) {
continue;
}
$this->semanticalError( $this->semanticalError(
"There is no mapped field named '$field' on class " . $class->name . ".", $deferredItem['token'] "There is no mapped field named '$field' on class " . $class->name . ".", $deferredItem['token']
); );

85
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2519Test.php Normal file
View File

@ -0,0 +1,85 @@
<?php
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Tests\Models\Legacy\LegacyUser;
use Doctrine\Tests\Models\Legacy\LegacyUserReference;
/**
* @group DDC-2519
*/
class DDC2519Test extends \Doctrine\Tests\OrmFunctionalTestCase
{
private $userId;
public function setUp()
{
$this->useModelSet('legacy');
parent::setUp();
$this->loadFixture();
}
/**
* @group DDC-2519
*/
public function testIssue()
{
$dql = 'SELECT PARTIAL l.{_source, _target} FROM Doctrine\Tests\Models\Legacy\LegacyUserReference l';
$result = $this->_em->createQuery($dql)->getResult();
$this->assertCount(2, $result);
$this->assertInstanceOf('Doctrine\Tests\Models\Legacy\LegacyUserReference', $result[0]);
$this->assertInstanceOf('Doctrine\Tests\Models\Legacy\LegacyUserReference', $result[1]);
$this->assertInstanceOf('Doctrine\Tests\Models\Legacy\LegacyUser', $result[0]->source());
$this->assertInstanceOf('Doctrine\Tests\Models\Legacy\LegacyUser', $result[0]->target());
$this->assertInstanceOf('Doctrine\Tests\Models\Legacy\LegacyUser', $result[1]->source());
$this->assertInstanceOf('Doctrine\Tests\Models\Legacy\LegacyUser', $result[1]->target());
$this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $result[0]->source());
$this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $result[0]->target());
$this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $result[1]->source());
$this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $result[1]->target());
$this->assertFalse($result[0]->target()->__isInitialized());
$this->assertFalse($result[0]->source()->__isInitialized());
$this->assertFalse($result[1]->target()->__isInitialized());
$this->assertFalse($result[1]->source()->__isInitialized());
$this->assertNotNull($result[0]->source()->getId());
$this->assertNotNull($result[0]->target()->getId());
$this->assertNotNull($result[1]->source()->getId());
$this->assertNotNull($result[1]->target()->getId());
}
public function loadFixture()
{
$user1 = new LegacyUser();
$user1->_username = 'FabioBatSilva';
$user1->_name = 'Fabio B. Silva';
$user1->_status = 'active';
$user2 = new LegacyUser();
$user2->_username = 'doctrinebot';
$user2->_name = 'Doctrine Bot';
$user2->_status = 'active';
$user3 = new LegacyUser();
$user3->_username = 'test';
$user3->_name = 'Tester';
$user3->_status = 'active';
$this->_em->persist($user1);
$this->_em->persist($user2);
$this->_em->persist($user3);
$this->_em->flush();
$this->_em->persist(new LegacyUserReference($user1, $user2, 'foo'));
$this->_em->persist(new LegacyUserReference($user1, $user3, 'bar'));
$this->_em->flush();
$this->_em->clear();
}
}

16
tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
View File

@ -1292,6 +1292,22 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
); );
} }
/**
* @group DDC-2519
*/
public function testPartialWithAssociationIdentifier()
{
$this->assertSqlGeneration(
"SELECT PARTIAL l.{_source, _target} FROM Doctrine\Tests\Models\Legacy\LegacyUserReference l",
'SELECT l0_.iUserIdSource AS iUserIdSource0, l0_.iUserIdTarget AS iUserIdTarget1 FROM legacy_users_reference l0_'
);
$this->assertSqlGeneration(
"SELECT PARTIAL l.{_description, _source, _target} FROM Doctrine\Tests\Models\Legacy\LegacyUserReference l",
'SELECT l0_.description AS description0, l0_.iUserIdSource AS iUserIdSource1, l0_.iUserIdTarget AS iUserIdTarget2 FROM legacy_users_reference l0_'
);
}
/** /**
* @group DDC-1339 * @group DDC-1339
*/ */