RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Refactored the object population algorithm

Browse source
This commit is contained in:
zYne 2006-09-28 13:39:37 +00:00
parent 753e9bd4cc
commit 25956bea87
1 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
lib/Doctrine/Hydrate.php
View file

@ -331,25 +331,10 @@ abstract class Doctrine_Hydrate extends Doctrine_Access {
if(empty($row)) if(empty($row))
continue; continue;
$ids = $this->tables[$key]->getIdentifier(); $ids = $this->tables[$key]->getIdentifier();
$emptyID = false;
if(is_array($ids)) {
foreach($ids as $id) {
if($row[$id] == null) {
$emptyID = true;
break;
}
}
} else {
if( ! isset($row[$ids]))
$emptyID = true;
}
$name = $key; $name = $key;
if($emptyID) { if($this->isIdentifiable($row, $ids)) {
$pointer = $this->joins[$name]; $pointer = $this->joins[$name];
@ -481,6 +466,26 @@ abstract class Doctrine_Hydrate extends Doctrine_Access {
} }
return $coll; return $coll;
} }
/**
* hasEmptyIdentifier
*
* @param array $row
* @param mixed $ids
* @return boolean
*/
public function isIdentifiable(array $row, $ids) {
$emptyID = false;
if(is_array($ids)) {
foreach($ids as $id) {
if($row[$id] == null)
return true;
}
} else {
if( ! isset($row[$ids]))
return true;
}
return false;
}
/** /**
* applyInheritance * applyInheritance
* applies column aggregation inheritance to DQL / SQL query * applies column aggregation inheritance to DQL / SQL query