RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 22:56:04 +03:00
Code Issues Projects Releases Wiki Activity

group by all fields when entity has foreign keys

Browse Source
This commit is contained in:
Fabio B. Silva 2011-11-15 20:27:45 -02:00
parent 4cbd5eac95
commit aeb2ab132b
3 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Doctrine/ORM/Query/SqlWalker.php
View File

@ -22,7 +22,8 @@ namespace Doctrine\ORM\Query;
use Doctrine\DBAL\LockMode, use Doctrine\DBAL\LockMode,
Doctrine\ORM\Mapping\ClassMetadata, Doctrine\ORM\Mapping\ClassMetadata,
Doctrine\ORM\Query, Doctrine\ORM\Query,
Doctrine\ORM\Query\QueryException; Doctrine\ORM\Query\QueryException,
Doctrine\ORM\Mapping\ClassMetadataInfo;
/** /**
* The SqlWalker is a TreeWalker that walks over a DQL AST and constructs * The SqlWalker is a TreeWalker that walks over a DQL AST and constructs
@ -1307,6 +1308,14 @@ class SqlWalker implements TreeWalker
$item->type = AST\PathExpression::TYPE_STATE_FIELD; $item->type = AST\PathExpression::TYPE_STATE_FIELD;
$sqlParts[] = $this->walkGroupByItem($item); $sqlParts[] = $this->walkGroupByItem($item);
} }
foreach ($this->_queryComponents[$groupByItem]['metadata']->associationMappings AS $mapping) {
if ($mapping['isOwningSide'] && $mapping['type'] & ClassMetadataInfo::TO_ONE) {
$item = new AST\PathExpression(AST\PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $groupByItem, $mapping['fieldName']);
$item->type = AST\PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION;
$sqlParts[] = $this->walkGroupByItem($item);
}
}
} }
return ' GROUP BY ' . implode(', ', $sqlParts); return ' GROUP BY ' . implode(', ', $sqlParts);

11
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php
View File

@ -111,17 +111,6 @@ class DDC1430Test extends \Doctrine\Tests\OrmFunctionalTestCase
$this->assertEquals($result[1]['p_count'], 3); $this->assertEquals($result[1]['p_count'], 3);
} }
public function testWithForeignKeys()
{
$query = $this->_em->createQuery('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u GROUP BY u');
$this->assertEquals('SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3, c0_.email_id AS email_id4 FROM cms_users c0_ GROUP BY c0_.id, c0_.status, c0_.username, c0_.name', $query->getSQL());
$query = $this->_em->createQuery('SELECT e FROM Doctrine\Tests\Models\CMS\CmsEmployee e GROUP BY e');
$this->assertEquals('SELECT c0_.id AS id0, c0_.name AS name1, c0_.spouse_id AS spouse_id2 FROM cms_employees c0_ GROUP BY c0_.id, c0_.name', $query->getSQL());
}
public function loadFixtures() public function loadFixtures()
{ {
$o1 = new DDC1430Order('NEW'); $o1 = new DDC1430Order('NEW');

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

@ -1317,6 +1317,22 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
'SELECT d0_.id AS id0, +d0_.value AS sclr1 FROM DDC1474Entity d0_' 'SELECT d0_.id AS id0, +d0_.value AS sclr1 FROM DDC1474Entity d0_'
); );
} }
/**
* @group DDC-1430
*/
public function testGroupByAllFieldsWhenObjectHasForeignKeys()
{
$this->assertSqlGeneration(
'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u GROUP BY u',
'SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ GROUP BY c0_.id, c0_.status, c0_.username, c0_.name, c0_.email_id'
);
$this->assertSqlGeneration(
'SELECT e FROM Doctrine\Tests\Models\CMS\CmsEmployee e GROUP BY e',
'SELECT c0_.id AS id0, c0_.name AS name1 FROM cms_employees c0_ GROUP BY c0_.id, c0_.name, c0_.spouse_id'
);
}
} }