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

Fixes #174

Browse Source
This commit is contained in:
zYne 2006-10-17 21:18:57 +00:00
parent 34a8acba63
commit cce886dadd
3 changed files with 57 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Doctrine/Hydrate.php
View File

@ -379,12 +379,12 @@ abstract class Doctrine_Hydrate extends Doctrine_Access {
$prev = $this->initRelated($prev, $name);
// aggregate values have numeric keys
if(isset($row[0])) {
$path = array_search($name, $this->tableAliases);
$alias = $this->getPathAlias($path);
//print_r($this->pendingAggregates);
foreach($row as $index => $value) {
$agg = false;
@ -459,7 +459,8 @@ abstract class Doctrine_Hydrate extends Doctrine_Access {
if( ! $prev[$pointer]->getLast()->hasReference($alias)) {
$prev[$name] = $this->getCollection($name);
$prev[$pointer]->getLast()->initReference($prev[$name],$fk);
}
} else
$prev[$name] = $prev[$pointer]->getLast()->get($alias);
}
}

9
lib/Doctrine/Query.php
View File

@ -113,6 +113,9 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
}
}
public function parseAggregateFunction2($func) {
$e = Doctrine_Query::bracketExplode($func, ' ');
$func = $e[0];
$pos = strpos($func, '(');
$name = substr($func, 0, $pos);
switch($name) {
@ -122,9 +125,9 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
case 'AVG':
$reference = substr($func, ($pos + 1), -1);
$e = explode('.', $reference);
$this->pendingAggregates[$e[0]][] = array($name, $e[1]);
$parts = explode('.', $reference);
$alias = (isset($e[1])) ? $e[1] : $name;
$this->pendingAggregates[$parts[0]][] = array($alias, $parts[1]);
break;
default:
throw new Doctrine_Query_Exception('Unknown aggregate function '.$name);

50
tests/QuerySelectTestCase.php
View File

@ -23,7 +23,16 @@ class Doctrine_Query_Select_TestCase extends Doctrine_UnitTestCase {
$this->assertEqual($q->getQuery(), 'SELECT MAX(entity.id) AS entity__0, MIN(entity.name) AS entity__1, COUNT(phonenumber.id) AS phonenumber__2 FROM entity LEFT JOIN phonenumber ON entity.id = phonenumber.entity_id WHERE (entity.type = 0)');
}
public function testUnknownAggregateFunction() {
$q = new Doctrine_Query();
try {
$q->parseQuery('SELECT UNKNOWN(u.id) FROM User');
$this->fail();
} catch(Doctrine_Query_Exception $e) {
$this->pass();
}
}
public function testAggregateFunctionValueHydration() {
$q = new Doctrine_Query();
@ -36,22 +45,55 @@ class Doctrine_Query_Select_TestCase extends Doctrine_UnitTestCase {
$this->assertEqual($users[2]->Phonenumber->getAggregateValue('COUNT'), 1);
$this->assertEqual($users[3]->Phonenumber->getAggregateValue('COUNT'), 1);
$this->assertEqual($users[4]->Phonenumber->getAggregateValue('COUNT'), 3);
}
public function testAggregateFunctionValueHydrationWithAliases() {
$q = new Doctrine_Query();
$q->parseQuery('SELECT u.id, COUNT(p.id) count FROM User u, u.Phonenumber p GROUP BY u.id');
$users = $q->execute();
$this->assertEqual($users[0]->Phonenumber->getAggregateValue('count'), 1);
$this->assertEqual($users[1]->Phonenumber->getAggregateValue('count'), 3);
$this->assertEqual($users[2]->Phonenumber->getAggregateValue('count'), 1);
$this->assertEqual($users[3]->Phonenumber->getAggregateValue('count'), 1);
$this->assertEqual($users[4]->Phonenumber->getAggregateValue('count'), 3);
}
public function testMultipleAggregateFunctionValueHydrationWithAliases() {
$q = new Doctrine_Query();
$q->parseQuery('SELECT u.id, COUNT(p.id) count, MAX(p.phonenumber) max FROM User u, u.Phonenumber p GROUP BY u.id');
$users = $q->execute();
$this->assertEqual($users[0]->Phonenumber->getAggregateValue('count'), 1);
$this->assertEqual($users[1]->Phonenumber->getAggregateValue('count'), 3);
$this->assertEqual($users[2]->Phonenumber->getAggregateValue('count'), 1);
$this->assertEqual($users[3]->Phonenumber->getAggregateValue('count'), 1);
$this->assertEqual($users[4]->Phonenumber->getAggregateValue('count'), 3);
$this->assertEqual($users[0]->Phonenumber->getAggregateValue('max'), '123 123');
$this->assertEqual($users[1]->Phonenumber->getAggregateValue('max'), '789 789');
$this->assertEqual($users[2]->Phonenumber->getAggregateValue('max'), '123 123');
$this->assertEqual($users[3]->Phonenumber->getAggregateValue('max'), '111 222 333');
$this->assertEqual($users[4]->Phonenumber->getAggregateValue('max'), '444 555');
}
public function testSingleComponentWithAsterisk() {
$q = new Doctrine_Query();
$q->parseQuery('SELECT u.* FROM User u');
$this->assertEqual($q->getQuery(),'SELECT entity.id AS entity__id, entity.name AS entity__name, entity.loginname AS entity__loginname, entity.password AS entity__password, entity.type AS entity__type, entity.created AS entity__created, entity.updated AS entity__updated, entity.email_id AS entity__email_id FROM entity WHERE (entity.type = 0)');
$this->assertEqual($q->getQuery(), 'SELECT entity.id AS entity__id, entity.name AS entity__name, entity.loginname AS entity__loginname, entity.password AS entity__password, entity.type AS entity__type, entity.created AS entity__created, entity.updated AS entity__updated, entity.email_id AS entity__email_id FROM entity WHERE (entity.type = 0)');
}
public function testSingleComponentWithMultipleColumns() {
$q = new Doctrine_Query();
$q->parseQuery('SELECT u.name, u.type FROM User u');
$this->assertEqual($q->getQuery(),'SELECT entity.id AS entity__id, entity.name AS entity__name, entity.type AS entity__type FROM entity WHERE (entity.type = 0)');
$this->assertEqual($q->getQuery(), 'SELECT entity.id AS entity__id, entity.name AS entity__name, entity.type AS entity__type FROM entity WHERE (entity.type = 0)');
}
public function testMultipleComponentsWithAsterisk() {
$q = new Doctrine_Query();