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

Browse Source
This commit is contained in:
zYne 2007-06-27 17:51:51 +00:00
parent 760e598ba5
commit 07a710ef0b
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Doctrine/Query.php
View File

@ -855,6 +855,9 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
foreach ($this->parts['orderby'] as $part) {
$part = trim($part);
$e = Doctrine_Tokenizer::bracketExplode($part, ' ');
$part = trim($e[0]);
$aggregate = false;
foreach ($this->parts['select'] as $select) {

18
tests/Query/MysqlSubqueryTestCase.php
View File

@ -38,7 +38,7 @@ class Doctrine_Query_MysqlSubquery_TestCase extends Doctrine_UnitTestCase
$this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh);
}
public function testGetLimitSubqueryWithOrderByOnAggregateValues()
public function testGetLimitSubquerSupportsOrderByWithAggregateValues()
{
$q = new Doctrine_Query();
$q->select('u.name, COUNT(DISTINCT a.id) num_albums');
@ -53,8 +53,22 @@ class Doctrine_Query_MysqlSubquery_TestCase extends Doctrine_UnitTestCase
$this->assertEqual($this->dbh->pop(), 'SELECT DISTINCT e2.id, COUNT(DISTINCT a2.id) AS a2__0 FROM entity e2 LEFT JOIN album a2 ON e2.id = a2.user_id WHERE (e2.type = 0) GROUP BY e2.id ORDER BY a2__0 LIMIT 5');
}
public function testGetLimitSubquerySupportsOrderByWithAggregateValuesAndDescKeyword()
{
$q = new Doctrine_Query();
$q->select('u.name, COUNT(DISTINCT a.id) num_albums');
$q->from('User u, u.Album a');
$q->orderby('num_albums DESC, u.name');
$q->groupby('u.id');
$q->limit(5);
public function testGetLimitSubqueryWithOrderByOnAggregateValuesAndColumns()
$q->execute();
$this->dbh->pop();
$this->assertEqual($this->dbh->pop(), 'SELECT DISTINCT e2.id, COUNT(DISTINCT a2.id) AS a2__0 FROM entity e2 LEFT JOIN album a2 ON e2.id = a2.user_id WHERE (e2.type = 0) GROUP BY e2.id ORDER BY a2__0 DESC, e2.name LIMIT 5');
}
public function testGetLimitSubquerySupportsOrderByWithAggregateValuesAndColumns()
{
$q = new Doctrine_Query();
$q->select('u.name, COUNT(DISTINCT a.id) num_albums');